diff --git a/src/pages/database/bom/components/BomBatching.jsx b/src/pages/database/bom/components/BomBatching.jsx
new file mode 100644
index 0000000..bcade1e
--- /dev/null
+++ b/src/pages/database/bom/components/BomBatching.jsx
@@ -0,0 +1,147 @@
+import React, { useState,useRef,useEffect } from 'react';
+import { PlusOutlined} from '@ant-design/icons';
+import { Modal, Form, Input, Button, Select,Radio,message,Tag,Divider,Space } from 'antd';
+import { GetByidBomList } from '../services';
+import {
+ EditableProTable,
+ ProTable
+} from '@ant-design/pro-table';
+const GoodsbomFrom = (props) => {
+ const { Option, OptGroup } = Select;
+ const [dataSource, setDataSource] = useState([]);
+ const [editableKeys, setEditableRowKeys] = useState([]);
+ const [form] = Form.useForm();
+
+ useEffect(() => {
+ let soredata=[];
+ if(props.BomId){
+ GetByidBomList(props.BomId).then((t)=>{
+ var data=t.data
+ if(data.bomEntry.length>0){
+ data.bomEntry.map(x=>{
+ var item={
+ id:x.id,
+ bomId:x.bomId,
+ batchingId:x.batchingId,
+ dosage:x.bomQty
+ }
+ console.log("item",item)
+ soredata.push(item)
+ })
+ }
+ console.log("soredata",soredata)
+ if(soredata.length>0){
+ setEditableRowKeys(soredata.map((item) => item.id))
+ setDataSource(soredata);
+ }
+ })
+ }
+
+ },[props])
+ const columns=[
+ {
+ title: '主键',
+ dataIndex: 'id',
+ key: 'id',
+ hideInTable: true,
+ hideInSearch: true,
+ tip: '规则名称是唯一的 key',
+ },
+ {
+ title: '配方',
+ dataIndex: 'bomId',
+ hideInTable: true,
+ hideInSearch: true,
+ },
+ {
+ title: '物料名称',
+ dataIndex: 'batchingId',
+ formItemProps: (form, { rowIndex }) => {
+ return {
+ rules:
+ rowIndex > 1 ? [{ required: true, message: '此项为必填项' }] : [],
+ };
+ },
+ valueType: 'select',
+ fieldProps: {
+ showSearch:true,
+ options: props.matedata.map((item, index) => {return {label:item.name,value:item.id}})
+ },
+ width: '25%',
+ },
+ {
+ title: '用量',
+ dataIndex: 'dosage',
+ valueType:'digit',
+ width: '15%',
+ },
+ {
+ title: '操作',
+ valueType: 'option',
+ width: '15%',
+ render: () => {
+ return null;
+ },
+ },
+]
+ const headleOk=()=>{
+ if(dataSource.length==0){
+ check=false;
+ message.error("请选择物料")
+ }else{
+ props.onBomBatchingFinish(dataSource);
+ //setDataSource([])
+ }
+
+
+ }
+ return (
+ {
+ props.onBomBatchingCancel();
+ }}
+ destroyOnClose
+ >
+ ({
+ id: Date.now(),
+ bomId:props.BomId
+ }),
+ }}
+
+ editable={{
+ type: 'multiple',
+ editableKeys,
+ actionRender: (row, config, defaultDoms) => {
+ return [defaultDoms.delete,defaultDoms.Button];
+ },
+ onValuesChange: (record, recordList) => {
+ setDataSource(recordList);
+ },
+ onDelete:async (key, row) =>{
+ console.log(key)
+ console.log(row)
+
+ },
+ onChange: setEditableRowKeys,
+ }}/>
+
+
+ //vessels
+ );
+};
+
+export default GoodsbomFrom;
diff --git a/src/pages/database/bom/components/CreateBom.jsx b/src/pages/database/bom/components/CreateBom.jsx
index 0e88c7f..b47800d 100644
--- a/src/pages/database/bom/components/CreateBom.jsx
+++ b/src/pages/database/bom/components/CreateBom.jsx
@@ -6,12 +6,11 @@ import { AddBomType } from '../services';
const App = (props) => {
- const [form] = Form.useForm();
const inputRef = useRef(null);
const [typename, settypename] = useState('');
const [dataSource, setDataSource] = useState([]);
const [editableKeys, setEditableRowKeys] = useState([]);
-
+
const onNameChange = (event) => {
settypename(event.target.value);
}
@@ -69,13 +68,39 @@ const App = (props) => {
}
+ const headleOk = () => {
+ props.form.validateFields().then((values) => {
+ var check = true;
+ var data = values;
+ debugger
+ if (dataSource.length == 0) {
+ check = false;
+ message.error("请选择物料")
+ } else {
+ data.mate = dataSource.map(x => { return { batchingId: x.batchingId, dosage: x.dosage } });
+ }
+ if (check) {
+ props.form.resetFields();
+ props.onFinish(data);
+ setDataSource([])
+ }
+
+ }).catch((info) => {
+ message.error("请填写必填信息")
+ });
+ }
+
return (
<>
-
-