+
: ''
@@ -2742,19 +2769,238 @@ const BillComponent = Form.create({
width={1480}
zIndex={1000}
title={importExcelTitle}
- bodyStyle ={{ height:'450px' }}
+ bodyStyle={{ height: '450px' }}
visible={props.showImportErrorVisible}
onCancel={props.handleCancelModal.bind(this, 'showImportErrorVisible')}
onOk={props.handleCancelModal.bind(this, 'showImportErrorVisible')}
onSaveState={props.onSaveState}
- // footer={null}
+ // footer={null}
>
: ''
}
+
);
});
+const SisColorChooseComponent = props => {
+ const { sisColorChooseVisible, sisColorField, sisTableName, controlSelectedRowId } = props;
+
+ const [rightData, setRightData] = useState(props?.sisColorSelectedData?.filter(item => item.bSelected) || []);
+ useEffect(() => {
+ if (props.sisColorSelectedData && props.sisColorSelectedData.length > 0) {
+ setRightData(props?.sisColorSelectedData?.filter(item => item.bSelected) || []);
+ } else {
+ setRightData([]);
+ }
+ }, [props.sisColorSelectedData, props.sisColorChooseVisible])
+ if (!sisColorChooseVisible) return "";
+
+ const handleClose = () => {
+
+ props.onSaveState({
+ sisColorChooseVisible: false,
+ });
+ };
+
+ const handelSubmit = () => {
+ const { [`${sisTableName}Data`]: tableData } = props;
+ const iIndex = tableData?.findIndex(item => item.sId === controlSelectedRowId);
+ // iPositiveColor sPositiveColor sOppositeColor
+ if (props?.sisColorSelectedData && props?.sisColorSelectedData?.length === 0) {
+ props.onSaveState({
+ sisColorChooseVisible: false,
+ sisColorSelectedData: []
+ });
+ return
+ }
+ const colorList = JSON.parse(tableData[iIndex][sisColorField]).map(item => {
+ const i = rightData.findIndex(rightItem => rightItem.sId === item.sId);
+ let newItem = {
+ ...item
+ }
+ if (i > -1) {
+ newItem = {
+ ...newItem,
+ bSelected: true
+ }
+ }
+ return newItem
+ });
+ tableData[iIndex] = {
+ ...tableData[iIndex],
+ [sisColorField]: JSON.stringify(colorList),
+ }
+ const { sPositiveColor, sOppositeColor } = tableData[iIndex]
+ const sPositiveColorList = (sPositiveColor && sPositiveColor !== 'undefined' && sPositiveColor !== 'null')
+ ? JSON.parse(sPositiveColor).filter(item => item.bSelected)
+ : [];
+ const sOppositeColorList = (sOppositeColor && sOppositeColor !== 'undefined' && sOppositeColor !== 'null')
+ ? JSON.parse(sOppositeColor).filter(item => item.bSelected)
+ : [];
+ const allTotalDColor = sPositiveColorList.reduce((total, item) => total + item.dColor, 0) + sOppositeColorList.reduce((total, item) => total + item.dColor, 0);
+ tableData[iIndex] = {
+ ...tableData[iIndex],
+ iOutsideQty: allTotalDColor,
+ iPublishQty: allTotalDColor
+ }
+
+ props.onSaveState({
+ [`${sisTableName}Data`]: [...tableData],
+ sisColorChooseVisible: false,
+ sisColorSelectedData: []
+ });
+
+ }
+
+ const handleLeftSelectChange = (selectedRowKeys, selectedRows) => {
+ setRightData(selectedRows);
+ };
+
+ const handleDeleteRight = (record) => {
+ const newData = rightData.filter(item => item.sId !== record.sId);
+ setRightData(newData);
+ };
+
+ const leftRowSelection = {
+ type: 'checkbox',
+ selectedRowKeys: rightData.map(item => item.sId),
+ onChange: handleLeftSelectChange,
+ };
+
+
+ const rowCellStyleLeft = {
+ fontSize: '16px',
+ };
+
+ const rowCellStyleRight = {
+ fontSize: '16px',
+ };
+
+ const headerCellStyle = {
+ fontSize: '20px',
+ fontWeight: 'bold',
+ };
+
+ const CustomCellLeft = (cellProps) => (
+
|
+ );
+
+ const CustomCellRight = (cellProps) => (
+
|
+ );
+
+ const baseColumns = [
+ {
+ title: '序号',
+ dataIndex: 'index',
+ key: 'index',
+ width: 60,
+ align: 'center',
+ render: (_, record, index) => index + 1,
+ customHeaderCell: () => ({ style: headerCellStyle }),
+ },
+ {
+ title: '名称',
+ dataIndex: 'sName',
+ customHeaderCell: () => ({ style: headerCellStyle }),
+ },
+ {
+ title: '板数',
+ dataIndex: 'dColor',
+ customHeaderCell: () => ({ style: headerCellStyle }),
+ },
+ ];
+ const rightColumns = [
+ ...baseColumns.map(col => ({ ...col })),
+ {
+ title: '操作',
+ key: 'action',
+ width: 80,
+ align: 'center',
+ customHeaderCell: () => ({ style: headerCellStyle }),
+ render: (_, record) => (
+
{ e.stopPropagation(); handleDeleteRight(record); }}
+ style={{ color: '#ff4d4f', cursor: 'pointer' }}
+ >
+ 删除
+
+ ),
+ },
+ ];
+
+ // --- 组件映射 ---
+
+ const tableComponentsLeft = {
+ body: {
+ cell: CustomCellLeft,
+ },
+ };
+
+ const tableComponentsRight = {
+ body: {
+ cell: CustomCellRight,
+ },
+ };
+
+ return (
+
+
+
+
+ }
+ onCancel={handleClose}
+ >
+
+ {/* 左侧表格 */}
+
+
+
+
+ {/* 右侧表格 */}
+
+
+
+
+
+ );
+};
export default CommonBase(CommonSales(CommonBill));
diff --git a/src/components/Common/CommonComponent/index.js b/src/components/Common/CommonComponent/index.js
index d0fc944..8900976 100644
--- a/src/components/Common/CommonComponent/index.js
+++ b/src/components/Common/CommonComponent/index.js
@@ -284,6 +284,8 @@ export default class CommonComponent extends Component {
onFocus = () => {
this.isDropdownFilter = false;
this.setState({ sActiveDisplay: false });
+ console.log(this.props, 'asdasdads');
+
};
onBlur = event => {
@@ -3369,6 +3371,10 @@ export default class CommonComponent extends Component {
this.props.onPreviewImage(e, dataUrl);
};
handleViewChoose = () => {
+ if (this.props?.showConfig?.sName.includes('Color')) {
+ this.props.onViewChoose(this.props.name, this.props.showConfig.sName, this.props.record, null, true);
+ return
+ }
const bGycs = this.props.showConfig?.showName?.includes("工艺参数");
if (this.state.enabled || bGycs) this.props.onViewChoose(this.props.name, this.props.showConfig.sName, this.props.record);
};
diff --git a/src/components/Common/CommonTable/index.js b/src/components/Common/CommonTable/index.js
index 5a5ea0e..cd0cdb0 100644
--- a/src/components/Common/CommonTable/index.js
+++ b/src/components/Common/CommonTable/index.js
@@ -4157,8 +4157,8 @@ class CommonTableRc extends React.Component {
this.props.onSaveState({ sCurrMemoProps });
}
}
- handleViewChoose = (name, sName, record, index) => {
- this.props.onViewChoose(name, sName, record, index);
+ handleViewChoose = (name, sName, record, index, isColor) => {
+ this.props.onViewChoose(name, sName, record, index, isColor);
}
/* 弹出通用窗体 */
handlePopupModal = (showConfig, name) => {
--
libgit2 0.22.2