From 7957bae65cf25a19a8dece4a4393010b8f3280e4 Mon Sep 17 00:00:00 2001
From: chenxt <10125295+chen-xintao97@user.noreply.gitee.com>
Date: Tue, 9 Dec 2025 09:04:41 +0800
Subject: [PATCH] 隐藏快速报价app模块
---
src/mobile/quotation/detail.jsx | 2 +-
src/mobile/quotation/detailNew.jsx | 2343 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
src/mobile/quotation/index.css | 17 ++++++++++-------
src/mobile/quotation/index.jsx | 34 +++++-----------------------------
src/mobile/quotation/index.less | 17 ++++++++++-------
src/mobile/quotation/master.jsx | 540 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------------------------------------------------------------------------
src/mobile/quotation/process.json | 6364 ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
src/mobile/quotation/props.json | 111373 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
src/mobile/quotation/quotationDetail.css | 141 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------
src/mobile/quotation/quotationDetail.less | 166 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------
src/routes/mobile/IndexMobile.js | 19 +++++++++++--------
11 files changed, 2307 insertions(+), 118709 deletions(-)
delete mode 100644 src/mobile/quotation/process.json
delete mode 100644 src/mobile/quotation/props.json
diff --git a/src/mobile/quotation/detail.jsx b/src/mobile/quotation/detail.jsx
index 479481a..fbe04d0 100644
--- a/src/mobile/quotation/detail.jsx
+++ b/src/mobile/quotation/detail.jsx
@@ -1,5 +1,5 @@
+/* eslint-disable */
import { useRef, useEffect, useState, useCallback, useMemo } from "react";
-import { history } from "umi";
import { Tabs, Selector, Grid, Image, Button, Checkbox, Switch, Dialog, Toast } from "antd-mobile";
import { AddOutline, MinusOutline } from "antd-mobile-icons";
import commonConfig from "@/utils/config";
diff --git a/src/mobile/quotation/detailNew.jsx b/src/mobile/quotation/detailNew.jsx
index a2c0309..7c9a476 100644
--- a/src/mobile/quotation/detailNew.jsx
+++ b/src/mobile/quotation/detailNew.jsx
@@ -1,6 +1,6 @@
+/* eslint-disable */
import { useRef, useEffect, useState, useCallback, useMemo } from "react";
-import { history } from "umi";
-import { Toast, Input, Tabs, Selector, Grid, Image, Button, Checkbox, Switch, Dialog, Radio, Space, CenterPopup } from "antd-mobile";
+import { Toast, Input, Tabs, Selector, Grid, Image, Button, Checkbox, Switch, Dialog, Radio, Space, CenterPopup, ImageViewer, Collapse, CapsuleTabs } from "antd-mobile";
import { AddOutline, MinusOutline, EditFill, CloseOutline } from "antd-mobile-icons";
import commonConfig from "@/utils/config";
import * as commonServices from "@/services/services";
@@ -15,6 +15,7 @@ import ShowImgM from "@/components/Common/BoxShowImgMaterial/indexNew";
import CommonBase from "@/components/Common/CommonBase";
import { cloneDeep, isEqual } from "lodash";
import moment from "moment";
+import { transform } from "@antv/g2/lib/util/transform";
const QuickQuoteEvent = props => {
const { location, selectedNode, sModelsId } = props;
// const selectedNode = JSON.parse(location.state).quotationData;
@@ -30,7 +31,7 @@ const QuickQuoteEvent = props => {
return pre;
}, {});
- const { slaveData = [], manyData = [] } = result;
+ const { slaveData = [], manyData = [], masterData = {} } = result;
const materialInfoFields = [
"sMaterialsName",
"sMaterialsNo",
@@ -53,21 +54,21 @@ const QuickQuoteEvent = props => {
];
const slaveDataNew = bInit
? slaveData.map(item => {
- const { materialsInfo = [], sMaterialsName } = item;
- if (!materialsInfo.length && sMaterialsName) {
- return {
- ...item,
- materialsInfo: [
- materialInfoFields.reduce((pre, cur) => {
- pre[cur] = item[cur];
- return pre;
- }, {}),
- ],
- };
- } else {
- return item;
- }
- })
+ const { materialsInfo = [], sMaterialsName } = item;
+ if (!materialsInfo.length && sMaterialsName) {
+ return {
+ ...item,
+ materialsInfo: [
+ materialInfoFields.reduce((pre, cur) => {
+ pre[cur] = item[cur];
+ return pre;
+ }, {}),
+ ],
+ };
+ } else {
+ return item;
+ }
+ })
: slaveData;
const manyDataNew = manyData.map(item => {
@@ -75,10 +76,16 @@ const QuickQuoteEvent = props => {
return item;
});
- return { ...result, slaveData: slaveDataNew, manyData: manyDataNew };
+ const { sType, sCustomerId, sCustomerName } = props.app.userinfo;
+ const bCustomer = sType === "Customer";
+ if (bCustomer && !masterData.sCustomerId) {
+ masterData.sCustomerName = sCustomerName;
+ masterData.sCustomerId = sCustomerId;
+ }
+ return { ...result, masterData, slaveData: slaveDataNew, manyData: manyDataNew };
};
- const sQuoConfig = commonUtils.convertStrToObj(props.masterData.sQuoConfig, {});
+ const sQuoConfig = commonUtils.convertStrToObj(props.masterData?.sQuoConfig, {});
const [state, setState] = useState(addState.onGetFilterState(sQuoConfig, true));
@@ -86,6 +93,7 @@ const QuickQuoteEvent = props => {
const { bLinkFieledClick } = props;
const [hideBackBtn, setHideBackBtn] = useState(false);
const [enabled, setEnabled] = useState(props.enabled);
+
useEffect(() => {
setHideBackBtn(!bLinkFieledClick);
setEnabled(!bLinkFieledClick || props.enabled);
@@ -105,9 +113,9 @@ const QuickQuoteEvent = props => {
}, []);
// 获取盒型定义配置
useEffect(() => {
- if (!formData.length) return;
+ if (!formData.length) return '';
const sBoxActiveId = formData.find(item => item.sGrd === "slave")?.gdsconfigformslave?.find(item => item.sName === "sName")?.sActiveId;
- if (!sBoxActiveId) return;
+ if (!sBoxActiveId) return '';
const { token } = props;
const configUrl = `${commonConfig.server_host}business/getModelBysId/${sBoxActiveId}?sModelsId=${sBoxActiveId}`;
commonServices.getService(token, configUrl).then(({ data: configReturn }) => {
@@ -120,7 +128,7 @@ const QuickQuoteEvent = props => {
// 获取column
useEffect(() => {
- if (!formData.length) return;
+ if (!formData.length) return '';
let result = {};
for (let i = 0; i < formData.length; i++) {
@@ -136,60 +144,150 @@ const QuickQuoteEvent = props => {
}
setState(pre => ({ ...pre, ...result }));
}, [formData.length]);
+ const { slaveData = [], masterData = {} } = state;
+ useEffect(() => {
+ if (!slaveData.length) return;
+ const bNotInit = slaveData.some(item => item.sBackProcessData);
+ if (!bNotInit) {
+ const { downAbleConfigs = [] } = state;
+ const downAbleConfigsNew = downAbleConfigs.filter(item => item.sDefaultProcessId);
+ if (downAbleConfigsNew.length) {
+ const slaveDataNew = slaveData.map(item => {
+ let sBackProcessData = [];
+ downAbleConfigsNew.forEach(({ sChineseDropDown: sChineseDropDownStr, sDefaultProcessId, sName, sId }) => {
+ const sChineseDropDown = commonUtils.convertStrToObj(sChineseDropDownStr, []);
+ const defaultProcess = sChineseDropDown.find(item => item.sId === sDefaultProcessId);
+ const name = `slaveDown${item.sBoxModel}`;
+ const sFieldName = sName;
+ const changeValue = { [sFieldName]: defaultProcess.sId };
+ const dropDownData = sChineseDropDown.map(item => ({
+ ...item,
+ sProductClassifyId: sId,
+ }));
+ const slaveDataReturn = onDataChange(name, sFieldName, changeValue, item.sId, dropDownData, true);
+ sBackProcessData = [...sBackProcessData, ...(slaveDataReturn?.sBackProcessData?.filter(item => item.sProductClassifyId === sId) || [])];
+ });
+ return {
+ ...item,
+ sBackProcessData,
+ };
+ });
+ setState(pre => {
+ return { ...pre, slaveData: slaveDataNew };
+ });
+ }
+ }
+ const bNotInit1 = !!masterData.cpProcessName;
+ if (!bNotInit1) {
+ const { finishedConfigs = [] } = state;
+ const finishedConfigsNew = finishedConfigs.filter(item => item.sDefaultProcessId);
+ if (finishedConfigsNew.length) {
+ let [cpProcessNameList, productProcessInfo] = [[], []];
+ finishedConfigsNew.forEach(({ sChineseDropDown: sChineseDropDownStr, sDefaultProcessId, sName, sId }) => {
+ const sChineseDropDown = commonUtils.convertStrToObj(sChineseDropDownStr, []);
+ const defaultProcess = sChineseDropDown.find(item => item.sId === sDefaultProcessId);
+ const name = "finished";
+ const sFieldName = sName;
+ const changeValue = { [sFieldName]: defaultProcess.sId };
+ const dropDownData = sChineseDropDown.map(item => ({
+ ...item,
+ sProductClassifyId: sId,
+ }));
+ const { cpProcessName: cpProcessNameNew, productProcessInfo: productProcessInfoNew } = onDataChange(
+ name,
+ sFieldName,
+ changeValue,
+ masterData.sId,
+ dropDownData,
+ true
+ );
+ cpProcessNameNew.split(",").forEach((item, index) => {
+ if (!cpProcessNameList.includes(item)) {
+ cpProcessNameList.push(item);
+ productProcessInfo.push(productProcessInfoNew[index]);
+ }
+ });
+ });
+ setState(pre => ({
+ ...pre,
+ masterData: {
+ ...masterData,
+ cpProcessName: cpProcessNameList.join(","),
+ productProcessInfo,
+ },
+ }));
+ }
+ }
+ }, [slaveData.map(item => item.sId).toString()]);
addState.onBackClick = () => {
props.onSaveState({ masterData: { ...props.masterData, sQuoConfig: JSON.stringify(addState.onGetFilterState(state)) }, quickQuoteModel: false });
};
- addState.onDataChange = (name, sFieldName, changeValue, sId, dropDownData, isWait) => {
- const { masterData = {}, slaveData = [], selectedNode = {} } = state;
+ const onDataChange = (name, sFieldName, changeValue, sId, dropDownData, isWait) => {
+ const { masterData = {}, slaveData = [], selectedNode = {}, manyData = [] } = state;
const extraState = {
calcPriceFinished: false,
- manyData: [],
};
if (name === "master") {
- const { showName: sTreeNodeName } = selectedNode;
- let masterDataNew = { ...masterData, ...changeValue };
+
+ const { showName: sTreeNodeName } = selectedNode || {};
+ const masterDataNew = { ...masterData, ...changeValue };
masterDataNew.handleType = masterDataNew.handleType || "update";
- masterDataNew.sId = commonUtils.createSid();
+ masterDataNew.sId = masterDataNew.sId || commonUtils.createSid();
+
if (sFieldName === "dProductQty") {
setState(pre => ({
...pre,
dProductQty: changeValue.dProductQty,
}));
}
- if (sFieldName === "sCustomerName") {
- masterDataNew = { ...masterDataNew, sCustomerId: changeValue.sId };
- }
if (sFieldName === "dLength" || sFieldName === "dWidth" || sFieldName === "dHeight") {
- if (props.currentBoxModel) {
- const boxModel = props.currentBoxModel.replace("slaveUp", "").replace("slaveDown", "");
- const iIndex = slaveData.findIndex(item => item.sTreeNodeName === sTreeNodeName && item.sBoxModel === boxModel);
- const sColumnNameConfig = commonUtils.convertStrToObj(slaveData[iIndex].sColumnNameConfig, []).map(item => ({
- ...item,
- iColValue: item.iColValue || 6,
- }));
- slaveData[iIndex] = {
- ...slaveData[iIndex],
- upAbleConfigsExtra: sColumnNameConfig,
- };
+ if (sTreeNodeName) {
+ if (props.currentBoxModel) {
+ const boxModel = props.currentBoxModel.replace("slaveUp", "").replace("slaveDown", "");
+ const iIndex = slaveData.findIndex(item => item.sTreeNodeName === sTreeNodeName && item.sBoxModel === boxModel);
+ const sColumnNameConfig = commonUtils.convertStrToObj(slaveData[iIndex].sColumnNameConfig, []).map(item => ({
+ ...item,
+ iColValue: item.iColValue || 6,
+ }));
+ slaveData[iIndex] = {
+ ...slaveData[iIndex],
+ upAbleConfigsExtra: sColumnNameConfig,
+ };
+ } else {
+ if (!slaveData[0]) return;
+ const sColumnNameConfig = commonUtils.convertStrToObj(slaveData[0].sColumnNameConfig, []).map(item => ({
+ ...item,
+ iColValue: item.iColValue || 6,
+ }));
+ slaveData[0] = {
+ ...slaveData[0],
+ upAbleConfigsExtra: sColumnNameConfig,
+ };
+ }
} else {
- if (!slaveData[0]) return;
- const sColumnNameConfig = commonUtils.convertStrToObj(slaveData[0].sColumnNameConfig, []).map(item => ({
- ...item,
- iColValue: item.iColValue || 6,
- }));
- slaveData[0] = {
- ...slaveData[0],
- upAbleConfigsExtra: sColumnNameConfig,
- };
+ masterDataNew[sFieldName] = changeValue[sFieldName];
+ }
+ if (masterData?.sMReserve3) {
+ const result1 = masterData?.sMReserve3.split('(')[0];
+ masterDataNew.sMReserve3 = `${result1}(${masterDataNew.dLength}*${masterDataNew.dWidth}*${masterDataNew.dHeight})`;
+ }
+ const num = Number(changeValue[sFieldName])
+ if (Number.isNaN(num)) {
+ masterDataNew[sFieldName] = null
}
}
+
setState(pre => ({ ...pre, masterData: masterDataNew, ...extraState }));
} else if (name.includes("slave")) {
+
const boxModel = name.replace("slaveUp", "").replace("slaveDown", "");
+
if (sFieldName === "sName") {
+ let upAbleConfigsList = []
+
if (!changeValue.sName) return;
const dropDownDataSelected = dropDownData.find(item => item.sName === changeValue.sName);
const { sColumnNameConfig, sColumnNameConfigExclusion, sColumnNameConfigPic } = dropDownDataSelected;
@@ -200,11 +298,31 @@ const QuickQuoteEvent = props => {
const defaultData = commonFunc.getDefaultData({ gdsconfigformslave: upAbleConfigsExtra });
delete defaultData.sId;
delete dropDownDataSelected.sId;
+ upAbleConfigsExtra?.forEach(item => {
+ if (item.sTypes && item.sTypes.includes('09')) {
+ const list = ['iSLength', 'iSWidth', 'iCLength', 'iCWidth']
+ const nameList = ['层1长', '层1宽', '层2长', '层2宽']
+ for (let index = 0; index < 4; index++) {
+ upAbleConfigsList.push({
+ ...item,
+ sName: item.sName + list[index],
+ sDefault: item[list[index]],
+ showName: item.showName + nameList[index]
+ })
+ }
+ } else {
+ upAbleConfigsList.push(item)
+ }
+ })
changeValue = {
...changeValue,
...defaultData,
...dropDownDataSelected,
upAbleConfigsExtra,
+ ...upAbleConfigsList.reduce((acc, item) => {
+ acc[item.sName] = item.sDefault;
+ return acc;
+ }, {}),
calcMethodData: commonUtils.convertStrToObj(sColumnNameConfigExclusion, []),
boxPicData: commonUtils.convertStrToObj(sColumnNameConfigPic, []),
};
@@ -212,41 +330,47 @@ const QuickQuoteEvent = props => {
const { selectedNode = {}, slaveConfig } = state;
const { showName: sTreeNodeName } = selectedNode;
- const iIndex = slaveData.findIndex(item => item.sTreeNodeName === sTreeNodeName && item.sBoxModel === boxModel);
+
+
if (sFieldName === "dSumPQty" && (sTreeNodeName.includes("骑马") || sTreeNodeName.includes("锁线"))) {
- if (!changeValue.dSumPQty || changeValue.dSumPQty % 4 !== 0) {
- message.info("P数要为4的倍数!");
- changeValue.dSumPQty = 4;
- extraState.slaveUpKey = `key_${commonUtils.createSid()}`;
+ changeValue.dSumPQty = Number(changeValue.dSumPQty);
+ if (changeValue.dSumPQty !== 0) {
+ if (!changeValue.dSumPQty || changeValue.dSumPQty % 4 !== 0) {
+ Toast.show({
+ content: "P数要为4的倍数",
+ });
+ changeValue.dSumPQty = 4;
+ extraState.slaveUpKey = `key_${commonUtils.createSid()}`;
+ }
}
+
}
+ const iIndex = slaveData.findIndex(item => item.sTreeNodeName === sTreeNodeName && item.sBoxModel === boxModel);
if (name.includes("slaveDown")) {
- const dropDownDataSelected = dropDownData.find(item => item.sId === changeValue.sId);
- dropDownDataSelected && (dropDownDataSelected[sFieldName] = dropDownDataSelected.sProcessName);
+
+ let dropDownDataSelected = dropDownData.find(item => item.sId === changeValue[sFieldName] || item.sId === changeValue.value);
+ // dropDownDataSelected.sProductClassifyId = dropDownDataSelected.sProductClassifyId ? dropDownDataSelected.sProductClassifyId : dropDownDataSelected.sId
const extraRowData = {};
- // if (dropDownDataSelected.sProcessName === "胶印") {
- // extraRowData.sPrintProcessId = dropDownDataSelected.sId;
- // }
if (dropDownDataSelected !== undefined) {
dropDownDataSelected[sFieldName] = dropDownDataSelected.sProcessName;
// 后道参数额外配置
const { sParamConfig: sParamConfigStr } = dropDownDataSelected || {};
const sParamConfig = commonUtils.convertStrToObj(sParamConfigStr, []);
extraState.backendParamsConfig = sParamConfig;
- extraState.backendConfig = { sParentFieldsName: sFieldName, sBoxModel: boxModel };
+ extraState.backendConfig = { sParentFieldsName: sFieldName, sBoxModel: boxModel, typeName: 'slave', dropDownDataSelected };
const sBackendParams = sParamConfig
- .map((item, index) => {
- const { sParamDefault, sParam,iOrder} = item;
+ .map(item => {
+ const { sParamDefault, sParam, sFieldName, iOrder } = item;
return !sParamDefault
? ""
: {
- sId: commonUtils.createSid(),
- value: sParamDefault,
- sParam: sParam,
- [`sParams${iOrder}`]: sParamDefault,
- sParamKey: `sParam${index}`,
- sParamKeyNew: sFieldName || `sParam${iOrder}`,
- };
+ sId: commonUtils.createSid(),
+ value: sParamDefault,
+ sParam: sParam,
+ [`sParam${iOrder}`]: sParamDefault,
+ ...(sFieldName ? { [sFieldName]: sParamDefault } : {}),
+ sParamKey: sFieldName || `sParam${iOrder}`,
+ };
})
.filter(item => item !== "");
dropDownDataSelected.sBackendParams = sBackendParams;
@@ -261,8 +385,9 @@ const QuickQuoteEvent = props => {
...extraRowData,
});
} else {
+
const sBackProcessData = slaveData[iIndex].sBackProcessData || [];
- const iIndex1 = sBackProcessData.findIndex(item => item[sFieldName]);
+ const iIndex1 = sBackProcessData.findIndex(item => item.sProductClassifyId === changeValue.sProductClassifyId);
if (iIndex1 === -1) {
dropDownDataSelected !== undefined && sBackProcessData.push(dropDownDataSelected);
} else {
@@ -283,6 +408,7 @@ const QuickQuoteEvent = props => {
} else {
if (iIndex === -1) {
slaveData.push({
+ ...commonFunc.getDefaultData(slaveConfig, { tree: selectedNode }),
...changeValue,
sId: commonUtils.createSid(),
handleType: "add",
@@ -293,33 +419,43 @@ const QuickQuoteEvent = props => {
slaveData[iIndex] = {
...(sFieldName === "sName"
? {
- sId: slaveData[iIndex].sId,
- sBoxModel: boxModel,
- sTreeNodeName,
- ...commonFunc.getDefaultData(slaveConfig),
- }
+ sId: slaveData[iIndex].sId,
+ sBoxModel: boxModel,
+ sTreeNodeName,
+ ...commonFunc.getDefaultData(slaveConfig, { tree: selectedNode }),
+ sBackProcessData: slaveData[iIndex].sBackProcessData,
+ }
: slaveData[iIndex]),
...changeValue,
handleType: slaveData[iIndex].handleType || "update",
};
+
}
}
const saveIndex = slaveData.findIndex(item => item.sTreeNodeName === selectedNode.showName && item.sBoxModel === boxModel);
const materialStyleLength = slaveData[saveIndex].materialLength || 0;
const materialStyleWidth = slaveData[saveIndex].materialWidth || 0;
+
+
slaveData[saveIndex] = {
...slaveData[saveIndex],
sMachineStyle: materialStyleLength + "*" + materialStyleWidth,
- dMachineQty: slaveData[saveIndex].dProductQty ? slaveData[saveIndex].dProductQty : masterData.dProductQty,
+ dMachineQty: masterData.sBillNo && slaveData[saveIndex].dMachineQty ? slaveData[saveIndex].dMachineQty : slaveData[saveIndex].dProductQty ? slaveData[saveIndex].dProductQty : masterData.dProductQty,
};
+
if (sFieldName === "dWlcd" || sFieldName === "dWlkd") {
- const horizontalBoxes = Math.floor(slaveData[saveIndex]?.dWlkd / slaveData[saveIndex]?.materialWidth);
- const verticalBoxes = Math.floor(slaveData[saveIndex]?.dWlcd / slaveData[saveIndex]?.materialLength);
+ const horizontalBoxes = Math.floor(slaveData[saveIndex]?.dWlkd / Number(slaveData[saveIndex]?.dMachineWidth));
+ const verticalBoxes = Math.floor(slaveData[saveIndex]?.dWlcd / Number(slaveData[saveIndex]?.dMachineLength));
const newDMaterialsKQty = horizontalBoxes * verticalBoxes;
slaveData[saveIndex] = {
...slaveData[saveIndex],
- dMachineQty: Math.floor(slaveData[saveIndex].dMachineQty / slaveData[saveIndex].dSinglePQty),
+ dMachineQty: masterData.sBillNo && slaveData[saveIndex].dMachineQty ? slaveData[saveIndex].dMachineQty : Math.floor(slaveData[saveIndex].dMachineQty / slaveData[saveIndex].dSinglePQty),
dMaterialsKQty: newDMaterialsKQty,
+ newMaterialLength: sFieldName === "dWlcd" ? changeValue[sFieldName] : slaveData[saveIndex]?.dWlcd,
+ newMaterialWidth: sFieldName === "dWlkd" ? changeValue[sFieldName] : slaveData[saveIndex]?.dWlkd,
+ materialLength: sFieldName === "dWlcd" ? changeValue[sFieldName] : slaveData[saveIndex]?.dWlcd,
+ materialWidth: sFieldName === "dWlkd" ? changeValue[sFieldName] : slaveData[saveIndex]?.dWlkd,
+ sMaterialsStyle: `${sFieldName === "dWlcd" ? changeValue[sFieldName] : slaveData[saveIndex]?.dWlcd || 0}*${sFieldName === "dWlkd" ? changeValue[sFieldName] : slaveData[saveIndex]?.dWlkd || 0}`,
};
}
@@ -331,23 +467,6 @@ const QuickQuoteEvent = props => {
};
}
- // if (sFieldName === "sPrint") {
- // slaveData[saveIndex] = {
- // ...slaveData[saveIndex],
- // sProcessId: changeValue.sId,
- // sPrintProcessId: changeValue.sId,
- // dMachineWidth: slaveData[saveIndex].dWlkd,
- // dMachineLength: slaveData[saveIndex].dWlcd,
- // };
- // }
-
- // if (sFieldName === "dMaxLength") {
- // slaveData[saveIndex] = {
- // ...slaveData[saveIndex],
- // dMaxLength: changeValue.dMachineLength,
- // dMaxWidth: changeValue.dMachineWidth,
- // };
- // }
if (sFieldName === "bFlap") {
slaveData[saveIndex] = {
...slaveData[saveIndex],
@@ -364,6 +483,13 @@ const QuickQuoteEvent = props => {
dFlap: "",
};
}
+ if (sFieldName === "iPrintModePo") {
+ slaveData[saveIndex] = {
+ ...slaveData[saveIndex],
+ iPrintModePo: Number(changeValue.value),
+ };
+ }
+
const { upAbleConfigsExtra = [] } = slaveData[saveIndex] || {};
upAbleConfigsExtra.forEach(item => {
@@ -371,11 +497,40 @@ const QuickQuoteEvent = props => {
item.sAssignFormula = null;
}
});
+
+ if (isWait) {
+ return slaveData.find(item => item.sBoxModel === boxModel);
+ }
+
setState(pre => ({ ...pre, slaveData, ...extraState }));
} else if (name === "finished") {
const { productProcessInfo = [] } = masterData;
- const dropDownDataSelected = dropDownData.find(item => item.sId === changeValue.sId);
- dropDownDataSelected && (dropDownDataSelected[sFieldName] = dropDownDataSelected.sProcessName);
+ const dropDownDataSelected = dropDownData.find(item => item.sId === changeValue[sFieldName] || item.sId === changeValue.value);
+ if (dropDownDataSelected !== undefined) {
+ dropDownDataSelected[sFieldName] = dropDownDataSelected.sProcessName;
+ // 后道参数额外配置
+ const { sParamConfig: sParamConfigStr } = dropDownDataSelected || {};
+ const sParamConfig = commonUtils.convertStrToObj(sParamConfigStr, []);
+ extraState.backendParamsConfig = sParamConfig;
+ extraState.backendConfig = { sParentFieldsName: sFieldName, typeName: 'finished', dropDownDataSelected };
+ const sBackendParams = sParamConfig
+ .map(item => {
+ const { sParamDefault, sParam, sFieldName, iOrder } = item;
+ return !sParamDefault
+ ? ""
+ : {
+ sId: commonUtils.createSid(),
+ value: sParamDefault,
+ sParam: sParam,
+ [`sParam${iOrder}`]: sParamDefault,
+ ...(sFieldName ? { [sFieldName]: sParamDefault } : {}),
+ sParamKey: sFieldName || `sParam${iOrder}`,
+ };
+ })
+ .filter(item => item !== "");
+ dropDownDataSelected.sBackendParams = sBackendParams;
+ }
+
const iIndex = productProcessInfo.findIndex(item => item.sProductClassifyId === dropDownData[0].sProductClassifyId);
if (iIndex === -1) {
dropDownDataSelected !== undefined && productProcessInfo.push(dropDownDataSelected);
@@ -389,11 +544,15 @@ const QuickQuoteEvent = props => {
const cpProcessName = productProcessInfo.map(item => item.sProcessName).join(",");
const masterDataNew = { ...masterData, cpProcessName, productProcessInfo };
masterDataNew.handleType = masterDataNew.handleType || "update";
- masterDataNew.sId = commonUtils.createSid(); // 目前默认是新增
+ masterDataNew.sId = masterDataNew.sId || commonUtils.createSid();
+ if (isWait) {
+ return masterDataNew;
+ }
setState(pre => ({ ...pre, masterData: masterDataNew, ...extraState }));
}
- };
+ };
+ addState.onDataChange = onDataChange;
addState.onGetAllDelData = () => {
const {
slaveData = [],
@@ -411,17 +570,69 @@ const QuickQuoteEvent = props => {
packData = [],
packDelData: packDelDataOld = [],
} = props;
+
const addState = {
- slaveDelData: [...slaveDelDataOld, ...slaveData.map(item => ({ ...item, handleType: "del" }))],
- controlDelData: [...controlDelDataOld, ...controlData.map(item => ({ ...item, handleType: "del" }))],
- materialsDelData: [...materialsDelDataOld, ...materialsData.map(item => ({ ...item, handleType: "del" }))],
- processDelData: [...processDelDataOld, ...processData.map(item => ({ ...item, handleType: "del" }))],
- manyqtysDelData: [...manyqtysDelDataOld, ...manyqtysData.map(item => ({ ...item, handleType: "del" }))],
- colorDelData: [...colorDelDataOld, ...colorData.map(item => ({ ...item, handleType: "del" }))],
- packDelData: [...packDelDataOld, ...packData.map(item => ({ ...item, handleType: "del" }))],
+ slaveDelData: [
+ ...slaveDelDataOld,
+ ...slaveData.filter(item => !slaveDelDataOld.map(item1 => item1.sId).includes(item.sId)).map(item => ({ ...item, handleType: "del" })),
+ ],
+ controlDelData: [
+ ...controlDelDataOld,
+ ...controlData.filter(item => !controlDelDataOld.map(item1 => item1.sId).includes(item.sId)).map(item => ({ ...item, handleType: "del" })),
+ ],
+ materialsDelData: [
+ ...materialsDelDataOld,
+ ...materialsData
+ .filter(item => !materialsDelDataOld.map(item1 => item1.sId).includes(item.sId))
+ .map(item => ({ ...item, handleType: "del" })),
+ ],
+ processDelData: [
+ ...processDelDataOld,
+ ...processData.filter(item => !processDelDataOld.map(item1 => item1.sId).includes(item.sId)).map(item => ({ ...item, handleType: "del" })),
+ ],
+ manyqtysDelData: [
+ ...manyqtysDelDataOld,
+ ...manyqtysData.filter(item => !manyqtysDelDataOld.map(item1 => item1.sId).includes(item.sId)).map(item => ({ ...item, handleType: "del" })),
+ ],
+ colorDelData: [
+ ...colorDelDataOld,
+ ...colorData.filter(item => !colorDelDataOld.map(item1 => item1.sId).includes(item.sId)).map(item => ({ ...item, handleType: "del" })),
+ ],
+ packDelData: [
+ ...packDelDataOld,
+ ...packData.filter(item => !packDelDataOld.map(item1 => item1.sId).includes(item.sId)).map(item => ({ ...item, handleType: "del" })),
+ ],
};
+
return addState;
};
+ // 判断单据是否被删除
+ const bDataDeleted = async () => {
+ const { masterConfig, currentId, masterData = {}, slaveConfig } = props;
+ if (!masterData.sBillNo) return false;
+ const sId = currentId || masterData.sId || "";
+ const returnData = await props.handleGetDataOne({
+ name: "master",
+ configData: masterConfig,
+ condition: { sId, pageSize: "", pageNum: "" },
+ bEditClick: false,
+ slaveConfig,
+ isWait: true,
+ });
+
+ if (returnData) return false;
+ Toast.show({
+ content: "当前报价单已被删除!请重新核价以生成新的报价单!"
+ });
+ props.onAdd();
+ setState(pre => ({
+ ...pre,
+ // manyData: [],
+ calcPriceFinished: false,
+ }));
+ return true;
+ };
+ addState.bDataDeleted = bDataDeleted;
// 存草稿
const onSaveDraft = (nextState = state, nextProps = props) => {
@@ -503,66 +714,152 @@ const QuickQuoteEvent = props => {
};
addState.onSaveDraft = onSaveDraft;
-
+ // 获取国际化名称
+ const getI18nName = (sFieldName, sDefault) => {
+ return commonFunc.showMessage(props.app?.commonConst, sFieldName) || sDefault;
+ };
// 核价按钮
addState.handleCalcPrice = async () => {
- const { masterData = {}, slaveData = [], selectedNode = {}, extraParts = {} } = state;
+ if (props.app.webSocket === null || props.app.webSocket?.readyState !== WebSocket.OPEN) {
+ console.log("================webSocket连接======================");
+ props.dispatch({
+ type: "app/createWebSocket",
+ payload: { reStart: true, dispatch: props.dispatch },
+ });
+
+ // 暂停2秒
+ await new Promise(resolve => setTimeout(resolve, 2000));
+ }
+
+ // const { masterData = {}, slaveData = [], selectedNode = {}, extraParts = {} } = state;
+ // const selectProduct = commonFunc.showLocalMessage(props, "selectProduct", "请先选择产品");
+ // const selectCustomer = commonFunc.showLocalMessage(props, "selectCustomer", "请先选择客户名称");
+ // const selectProductUnit = commonFunc.showLocalMessage(props, "selectProductUnit", "请先输入产品单位");
+ // const inputLength = commonFunc.showLocalMessage(props, "inputLength", "请先输入长度");
+ // const inputWidth = commonFunc.showLocalMessage(props, "inputWidth", "请先输入宽度");
+ // const inputQty = commonFunc.showLocalMessage(props, "inputQty", "请先输入数量");
+ // if (commonUtils.isEmptyObject(selectedNode)) {
+ // // message.error("请先选择产品");
+ // Toast.show({
+ // icon: "fail",
+ // content: selectProduct,
+ // });
+ // return;
+ // }
+ const {
+ masterConfig,
+ masterData = {},
+ slaveConfig,
+ slaveData = [],
+ selectedNode = {},
+ extraParts = {},
+ downAbleConfigs = [],
+ downAbleExtraConfigs = [],
+ finishedConfigs = [],
+ } = state;
const selectProduct = commonFunc.showLocalMessage(props, "selectProduct", "请先选择产品");
- const selectCustomer = commonFunc.showLocalMessage(props, "selectCustomer", "请先选择客户名称");
- const selectProductUnit = commonFunc.showLocalMessage(props, "selectProductUnit", "请先输入产品单位");
- const inputLength = commonFunc.showLocalMessage(props, "inputLength", "请先输入长度");
- const inputWidth = commonFunc.showLocalMessage(props, "inputWidth", "请先输入宽度");
- const inputQty = commonFunc.showLocalMessage(props, "inputQty", "请先输入数量");
if (commonUtils.isEmptyObject(selectedNode)) {
- // message.error("请先选择产品");
Toast.show({
icon: "fail",
content: selectProduct,
});
return;
}
- const mustFieldsMap = {
- sCustomerName: selectCustomer,
- sProductName: selectCustomer,
- sProductUnit: selectProductUnit,
- dLength: inputLength,
- dWidth: inputWidth,
- dProductQty: inputQty,
- };
- const checkResult = Object.keys(mustFieldsMap).find(item => masterData[item] === undefined);
- if (checkResult) {
- Toast.show({
- icon: "fail",
- content: mustFieldsMap[checkResult],
- });
- return;
+ const errMsgList = [];
+ const masterConfigMust = masterConfig?.gdsconfigformslave.filter(item => item.bVisible && item.bNotEmpty);
+ if (!masterConfigMust) return;
+ const checkResult = masterConfigMust.filter(item => !masterData[item.sName]);
+ if (checkResult.length) {
+ errMsgList.push(
+ checkResult.map(item => 【{item.showName}】),
+ {getI18nName("isNotNull")},
+
+ );
}
+ // const mustFieldsMap = {
+ // sCustomerName: selectCustomer,
+ // sProductName: selectCustomer,
+ // sProductUnit: selectProductUnit,
+ // dLength: inputLength,
+ // dWidth: inputWidth,
+ // dProductQty: inputQty,
+ // };
+
+ // const checkResult = Object.keys(mustFieldsMap).find(item => masterData[item] === undefined);
+ // if (checkResult) {
+ // Toast.show({
+ // icon: "fail",
+ // content: mustFieldsMap[checkResult],
+ // });
+ // return;
+ // }
const { bBox, showName, sId } = selectedNode;
let { sAllPartsName } = selectedNode;
if (!sAllPartsName) {
sAllPartsName = showName;
}
+ const slaveConfigMust = slaveConfig.gdsconfigformslave
+ .filter(item => item.bVisible && item.iTag && item.bNotEmpty && item.sName !== "sMaterialsName")
+ .filter(item => (bBox ? true : item.sName !== "sName"));
+
+ const sMaterialsNameConfig = slaveConfig.gdsconfigformslave.find(item => item.sName === "sMaterialsName");
+ const downAbleConfigMust = [...downAbleConfigs, ...downAbleExtraConfigs].filter(item => item.bNotEmpty);
+
+ const errorList = [];
+ const partsList = [];
+ slaveData.forEach(slaveRowData => {
+ const list = slaveConfigMust.filter(item => !slaveRowData[item.sName]);
+ if (!slaveRowData.materialsInfo || slaveRowData.materialsInfo.some(item => !item.sMaterialsName)) {
+ list.push(sMaterialsNameConfig);
+ }
+ const { sBackProcessData = [] } = slaveRowData;
+ downAbleConfigMust.forEach(item => {
+ if (!sBackProcessData.some(x => x.sProductClassifyId === item.sId)) {
+ list.push(item);
+ }
+ });
+ errorList.push(list);
+ partsList.push(slaveRowData.sBoxModel);
+ });
+
+ if (!errorList.some(item => !item.length)) {
+ errMsgList.push(
+ errorList.map((item, index0) => [
+ {partsList[index0]}:,
+ ...item.map(config => 【{config.showName}】),
+ {getI18nName("isNotNull")},
+
,
+ ])
+ );
+ }
+
+ const finishedConfigMust = finishedConfigs.filter(item => item.bNotEmpty);
+ const { productProcessInfo = [] } = masterData;
+
+ const checkResult1 = finishedConfigMust.filter(item => !productProcessInfo.some(x => x.sProductClassifyId === item.sId));
+ if (checkResult1.length) {
+ errMsgList.push(
+ checkResult1.map(item => 【{item.showName}】),
+ {getI18nName("isNotNull")},
+
+ );
+ }
- const slaveRowDataList =
- slaveData
- .filter(item => item.sTreeNodeName === showName && item.materialsInfo && !item.materialsInfo.some(x => !x.sMaterialsName))
- .filter(item => (bBox ? item.sName : true))
- .filter(item => item.sPrint !== undefined && item.sColor !== undefined && item.iPrintModePo !== undefined) || [];
- if (!slaveRowDataList.length) {
- // message.error("请至少保证一个部件的材料信息填写完整");
+ if (errMsgList.length) {
+ // message.error(errMsgList, 3);
Toast.show({
icon: "fail",
- content: "请至少保证一个部件的材料信息填写完整",
+ content: errMsgList,
});
return;
}
setState(pre => ({ ...pre, calcPriceLoading: true, calcPriceFinished: false }));
-
const { sModelsId, token, sBoxModel } = props;
- const extraPartsList = extraParts[showName] || [];
+ const extraPartsList = extraParts?.[showName] || [];
+
const sAllPartsNameList = [...sAllPartsName.split(","), ...extraPartsList];
const masterDataNew = {
@@ -574,13 +871,12 @@ const QuickQuoteEvent = props => {
dProductWidth: masterData.dWidth,
dProductLength: masterData.dLength,
dProductHeight: masterData.dHeight,
- sConsigneeMobile: masterData.sMobile,
- sConsignee: masterData.sContacts,
sProductStyle:
masterData.dHeight !== undefined
? `${masterData.dLength}*${masterData.dWidth}*${masterData.dHeight}`
: `${masterData.dLength}*${masterData.dWidth}`,
};
+
const paramMap = {
bQuotation: true,
...masterDataNew,
@@ -602,22 +898,25 @@ const QuickQuoteEvent = props => {
}
return pre;
}, {}),
+ iOrder: 1,
dPartsQty: masterData.dProductQty,
// iPositiveColor: Number(item.sColor),
iOppositeColor: item.sBackProcessData?.find(item => item.bPrintParams)?.iPositiveColor || 0,
iOppositeSpecialColor: item.sBackProcessData?.find(item => item.bPrintParams)?.iPositiveSpecialColor || 0,
sPartsName: item.sBoxModel,
materialsInfo: item.materialsInfo?.filter(x => commonUtils.isNotEmptyObject(x)),
- iPrintModePo: Number(item.value),
processInfo:
item.sBackProcessData?.map(item => ({
...item,
- sProcessId: item.sId,
+ sProcessId: item.sProcessId || item.sId,
})) || [],
};
}),
};
- paramMap.sPartsStyle = (paramMap.partsInfo[0].dPartsLength || 0) + "*" + (paramMap.partsInfo[0].dPartsWidth || 0);
+
+ const firstPart = paramMap.partsInfo && paramMap.partsInfo[0];
+ paramMap.sPartsStyle =
+ ((firstPart && firstPart.dPartsLength) || 0) + "*" + ((firstPart && firstPart.dPartsWidth) || 0);
if (paramMap.sPartsStyle === "0*0") {
delete paramMap.sPartsStyle;
}
@@ -755,12 +1054,13 @@ const QuickQuoteEvent = props => {
partsDataRow.iOppositeColor = partsDataRow.iPositiveColor;
}
delete partsDataRow.dMaterialsKQty;
- delete partsDataRow.dMaterialsLength;
- delete partsDataRow.dMaterialsWidth;
+ // delete partsDataRow.dMaterialsLength;
+ // delete partsDataRow.dMaterialsWidth;
// if (productClassify.bSpecialRules) {
// partsDataRow.dMachineLength = partsDataRow.dMaxMachineLength;
// partsDataRow.dMachineWidth = partsDataRow.dMaxMachineWidth;
// }
+
controlData.push(partsDataRow);
// 材料信息
for (let i = 0; i < partInfo.materialsInfo.length; i++) {
@@ -808,6 +1108,9 @@ const QuickQuoteEvent = props => {
processPrintDataRow.sId = commonUtils.createSid();
processPrintDataRow.sParentId = masterData.sId;
processPrintDataRow.sControlId = partsDataRow.sId;
+ const iSpecialColor = partInfo.iSpecialColor !== undefined ? partInfo.iSpecialColor : partInfo.partInfoiSpecialColor;
+ processPrintDataRow.sColorSerialMemo = JSON.stringify([{ sId: partInfo.sColorId, sName: partInfo.sColor, dColor: partInfo.iColor, iSpecialColor }]);
+
// processPrintDataRow.sSlaveId = ' ';
processData.push(processPrintDataRow);
// 配套工序
@@ -859,6 +1162,20 @@ const QuickQuoteEvent = props => {
processAfterDataRow.sId = commonUtils.createSid();
processAfterDataRow.sParentId = masterData.sId;
processAfterDataRow.sControlId = partsDataRow.sId;
+
+ const sBackendParams = process.sBackendParams || [];
+ if (sBackendParams.length) {
+ const sQuoParams = sBackendParams.map(item => ({
+ sParamKey: item.sParamKey,
+ sParamName: item.sParam,
+ sParamValue: item.value !== undefined ? item.value : "",
+ bSelfCbx: !(item.value === "" || item.value === undefined),
+ }));
+ processAfterDataRow.sQuoParams = JSON.stringify(sQuoParams);
+ }
+ if (process.sColor) {
+ processAfterDataRow.sColorSerialMemo = JSON.stringify([{ sId: process.sColorId, sName: process.sColor, dColor: process.iColor }]);
+ }
// processAfterDataRow.sSlaveId = ' ';
processData.push(processAfterDataRow);
// 配套工序
@@ -909,6 +1226,18 @@ const QuickQuoteEvent = props => {
processProductDataRow.iOrder = iOrder + 1;
processProductDataRow.sId = commonUtils.createSid();
processProductDataRow.sParentId = masterData.sId;
+
+ const sBackendParams = process.sBackendParams || [];
+ if (sBackendParams.length) {
+ const sQuoParams = sBackendParams.map(item => ({
+ sParamKey: item.sParamKey,
+ sParamName: item.sParam,
+ sParamValue: item.value !== undefined ? item.value : "",
+ bSelfCbx: !(item.value === "" || item.value === undefined),
+ }));
+ processProductDataRow.sQuoParams = JSON.stringify(sQuoParams);
+ }
+
// processProductDataRow.sSlaveId = ' ';
processData.push(processProductDataRow);
// 配套工序
@@ -937,6 +1266,18 @@ const QuickQuoteEvent = props => {
if (!commonUtils.isEmptyArr(slaveData)) {
addState.slaveSelectedRowKeys = [slaveData[0].sId];
}
+ const { sPrintConfig = {}, downAbleConfigs = [], finishedConfigs = [] } = state;
+ const processConfigs = [sPrintConfig, ...downAbleConfigs, ...finishedConfigs];
+
+ const configOrderMap = {};
+ processConfigs.forEach((config, index) => {
+ configOrderMap[config.sId] = index;
+ });
+
+ processData.sort((a, b) => {
+ return configOrderMap[a.sProcessClassifyId] - configOrderMap[b.sProcessClassifyId];
+ });
+ processData = processData.map((item, index) => ({ ...item, iOrder: index + 1 }));
const newState = {
materialsConfig,
@@ -952,47 +1293,56 @@ const QuickQuoteEvent = props => {
sInfoArr,
// bVisiblesInfo: !!commonUtils.isNotEmptyArr(sInfoArr),
Loading: false,
+ dQuickQuoteProductQty: state?.dQuickQuoteProductQty
// quickQuoteModel: false,
};
+
delete newState.masterData.sQuoConfig;
- const masterProps = {
- ...props,
- };
+
setState(pre => ({
...pre,
newNextProps: {
dQuickQuoteProductQty: state.dQuickQuoteProductQty,
- ...masterProps,
+ ...props,
...newState,
- manyqtysConfig: state.manyConfig,
- manyqtysData: state.manyData,
+ // manyqtysConfig: state.manyConfig,
+ // manyqtysData: state.manyData,
},
}));
const result = await props.handleCalculation(
false,
- { ...masterProps, ...newState, manyqtysConfig: state.manyConfig, manyqtysData: state.manyData, state },
+ { ...props, ...newState, manyqtysConfig: state.manyConfig, manyqtysData: state.manyData, manyqtysDelData: state.manyData, state },
true,
{ ...props, state }
);
-
if (commonUtils.isEmptyObject(result)) {
setState(pre => ({ ...pre, calcPriceLoading: false }));
return;
}
-
+ let hasCalled = false;
const { manyqtysData = [] } = result;
result.manyqtysData = manyqtysData.map(item => ({
...item,
sParentId: newState.masterData.sId,
}));
setState(pre => {
- const preNew = { ...pre, manyData: result.manyqtysData, calcPriceLoading: false, calcPriceFinished: true };
+ const preNew = {
+ ...pre,
+ manyData: result.manyqtysData,
+ calcPriceLoading: false,
+ calcPriceFinished: true,
+ };
+
const stateNew = { ...newState, ...result };
+
+ if (hasCalled) return preNew; // 防止重复执行
+ hasCalled = true;
+
props.onSaveState(stateNew, () => {
- // stateNew nextProps
onSaveDraft(preNew, stateNew);
});
+
return preNew;
});
} else {
@@ -1028,6 +1378,7 @@ const QuickQuoteEvent = props => {
}
};
+
return {
...props,
onDataChange0: props.onDataChange,
@@ -1041,22 +1392,25 @@ const QuickQuoteEvent = props => {
// 入口
const QuotationAllprogressDetail = baseProps => {
const props = QuickQuoteEvent(baseProps);
- const { selectedNode, slaveConfig, quotationData, app, sModelsId, masterData } = props;
+ const { selectedNode, quotationData, app, sModelsId, masterData, state } = props;
+ const { slaveConfig, slaveData = [] } = state
const { showName, sUnit } = quotationData;
const timeRef = useRef(0);
-
useEffect(() => {
+
+ if (!selectedNode.sId || commonUtils.isEmptyObject(slaveConfig)) return '';
+ timeRef.current += 1;
const getDropDownData = async props => {
- const showDownConfig = props.state.slaveConfig?.gdsconfigformslave.find(item => item.sControlName === "BtnDownConfig");
+ const showDownConfig = slaveConfig?.gdsconfigformslave.find(item => item.sControlName === "BtnDownConfig");
const downAbleConfigs = await getSqlDropDownData({ ...showDownConfig });
props.setState(pre => {
const { slaveData = [], slaveConfig } = pre;
const addState = {};
- const defaultData = commonFunc.getDefaultData(slaveConfig);
+ const defaultData = commonFunc.getDefaultData(slaveConfig, { tree: selectedNode });
const slaveDataNew = slaveData.filter(item => item.sTreeNodeName === selectedNode.showName);
if (!slaveDataNew.length) {
const sAllPartsName = selectedNode.sAllPartsName || selectedNode.showName;
- sAllPartsName.split(",").forEach((item, index) => {
+ sAllPartsName?.split(",").forEach((item, index) => {
const tempData = {
sId: commonUtils.createSid(),
handleType: "add",
@@ -1079,10 +1433,32 @@ const QuotationAllprogressDetail = baseProps => {
addState.slaveData = slaveDataNew;
addState.extraParts = {};
}
+ let sQuoConfigData = {}
+ if (props?.sQuoData) {
+ const sQuoConfig = commonUtils.convertStrToObj(props.masterData?.sQuoConfig, {});
+ sQuoConfigData = props.onGetFilterState(sQuoConfig, true)
+ sQuoConfigData = {
+ ...sQuoConfigData,
+ masterData: { ...sQuoConfigData?.masterData, handleType: masterData?.handleType, sBillNo: masterData?.sBillNo },
+ slaveData: sQuoConfigData?.slaveData?.map((item, i) => {
+ return {
+ ...item,
+ sId: props?.slaveData[i] ? sQuoConfigData?.slaveData[i]?.sId : item.sId
+ }
+ })
+ }
+ } else {
+ sQuoConfigData = {
+ masterData: {
+ ...masterData,
+ sProductName: showName, sProductUnit: sUnit,
+ }
+ }
+ }
+
return {
...pre,
...addState,
- masterData: { sProductName: showName, sProductUnit: sUnit, ...masterData },
downAbleConfigs: downAbleConfigs
.filter(item => item.sType === "2")
.map((item, index) => ({
@@ -1099,16 +1475,25 @@ const QuotationAllprogressDetail = baseProps => {
iColValue: item.iColValue || 4,
sVisColumnName: "sProcessName",
})),
+ ...sQuoConfigData,
+ // masterData: { sProductName: showName, sProductUnit: sUnit, handleType: masterData?.handleType, sBillNo: masterData?.sBillNo },
+
};
});
+
};
if (selectedNode.sTypeKey === "juantong") {
props.onSaveState({
masterData: { ...props.masterData, sFormId: "101251240115016002356125200" },
});
+ } else {
+ props.onSaveState({
+ masterData: { ...props.masterData, sFormId: "101251240115016076506222050" },
+ });
}
getDropDownData(props);
- }, [props.state.slaveConfig]);
+ }, [selectedNode.sId, commonUtils.isEmptyObject(slaveConfig)]);
+
const getSqlDropDownData = async ({ sId }) => {
const url = `${commonConfig.server_host}business/getSelectLimit/${sId}`;
const body = {
@@ -1124,7 +1509,7 @@ const QuotationAllprogressDetail = baseProps => {
// 取上机尺寸
return commonUtils.convertStrToObj(sColumnNameConfigStr, []);
};
-
+
return (