Skip to content

W
wms
Commit 281248ef authored by wuhao's avatar wuhao 🎯
Browse files
Options

asder

parent 0d299f54
Show whitespace changes
Inline Side-by-side
Showing with 196 additions and 386 deletions
config/proxy.js
View file @ 281248ef
...@@ -11,7 +11,7 @@ export default { ...@@ -11,7 +11,7 @@ export default {
// localhost:8000/api/** -> https://preview.pro.ant.design/api/** // localhost:8000/api/** -> https://preview.pro.ant.design/api/**
"/wms/": { "/wms/": {
// 要代理的地址 // 要代理的地址
target: "http://192.168.40.134:18040/", //39:18040 23/wms/ //60 翔 target: "http://192.168.40.212:18040/", //39:18040 23/wms/ //60 翔
changeOrigin: true, changeOrigin: true,
pathRewrite: { pathRewrite: {
"^/wms": "", "^/wms": "",
......
src/components/Tableform/index.jsx
View file @ 281248ef
...@@ -7,7 +7,7 @@ export default (props) => { ...@@ -7,7 +7,7 @@ export default (props) => {
const screens = useBreakpoint(); const screens = useBreakpoint();
return ( return (
<div> <div className="diycard">
{screens.xs ? ( {screens.xs ? (
<div <div
style={{ display: "flex", flexDirection: "column", height: "100%" }} style={{ display: "flex", flexDirection: "column", height: "100%" }}
...@@ -20,12 +20,13 @@ export default (props) => { ...@@ -20,12 +20,13 @@ export default (props) => {
</div> </div>
</div> </div>
) : props.withCard === false ? ( ) : props.withCard === false ? (
<div style={{ display: "flex" }}> <div style={{ display: "flex", width: "100%" }}>
<div style={{ flex: 1 }}> {(props.childposition == "left" || !props.childposition) &&
props.children}
<div style={{ flex: 1, width: "100%" }}>
{props.childposition == "top" && props.children} {props.childposition == "top" && props.children}
<Mtable {...props} /> <Mtable {...props} />
</div> </div>
{(props.childposition == "right" || !props.childposition) && {(props.childposition == "right" || !props.childposition) &&
props.children} props.children}
</div> </div>
...@@ -39,8 +40,10 @@ export default (props) => { ...@@ -39,8 +40,10 @@ export default (props) => {
tabList={props.tabList} tabList={props.tabList}
onTabChange={props.onTabChange} onTabChange={props.onTabChange}
> >
<div style={{ display: "flex" }}> <div style={{ display: "flex", width: "100%" }}>
<div style={{ flex: 1 }}> {(props.childposition == "left" || !props.childposition) &&
props.children}
<div style={{ flex: 1, width: "100%" }}>
{props.childposition == "top" && props.children} {props.childposition == "top" && props.children}
<Mtable {...props} /> <Mtable {...props} />
</div> </div>
......
src/components/TreeRender/index.jsx
View file @ 281248ef
import React, { useState, useMemo } from 'react'; import React, { useState, useMemo, useRef, createContext } from 'react';
import { Tree, Input, Card, Tooltip,Divider } from 'antd'; import { Tree, Input, Popconfirm, Tooltip, Divider, Modal, message } from 'antd';
import { MinusSquareOutlined,FormOutlined,PlusSquareOutlined } from '@ant-design/icons'; import { MinusSquareOutlined, FormOutlined, PlusSquareOutlined } from '@ant-design/icons';
import getPrem from '@/utils/getPrem'; import getPrem from '@/utils/getPrem';
import { useRequest } from 'ahooks'; import { useRequest } from 'ahooks';
import { doFetch } from '@/utils/doFetch'; import { doFetch } from '@/utils/doFetch';
let { Search } = Input;
const ReachableContext = createContext(null);
let { Search } = Input,
{ TreeNode } = Tree;
function TreeRender({ url, deleteurl, saveurl, onselected }) { function TreeRender({ url, deleteurl, saveurl, onselected }) {
const [search, setsearch] = useState(""); const [search, setsearch] = useState("");
const { data, loading } = useRequest(() => { const [savetitle, setsavetitle] = useState(null);
const [modal, setModal] = useState({
visible: false
});
const { data, loading, refresh } = useRequest(() => {
return doFetch({ url, params: { title: search } }) return doFetch({ url, params: { title: search } })
},{
refreshDeps:[search]
}); });
const ref1 = useRef(), ref2 = useRef();
const treeData = useMemo(() => { const treeData = useMemo(() => {
return data?.data?.dataList ?? [] return data?.data?.dataList ?? []
}, [data]); }, [data]);
...@@ -25,7 +35,7 @@ function TreeRender({ url, deleteurl, saveurl, onselected }) { ...@@ -25,7 +35,7 @@ function TreeRender({ url, deleteurl, saveurl, onselected }) {
const title = const title =
index > -1 ? ( index > -1 ? (
<Tooltip title={item.title} placement="bottom"> <Tooltip title={item.title} placement="bottom">
<span style={{ display: "inline-block", maxWidth: 68, overflow: "hidden", textOverflow: "ellipsis", whiteSpace: "nowrap" }}> <span style={{ display: "inline-block", maxWidth: 88, overflow: "hidden", textOverflow: "ellipsis", whiteSpace: "nowrap" }}>
{beforeStr} {beforeStr}
<span style={{ color: '#f50' }}>{search}</span> <span style={{ color: '#f50' }}>{search}</span>
{afterStr} {afterStr}
...@@ -33,7 +43,7 @@ function TreeRender({ url, deleteurl, saveurl, onselected }) { ...@@ -33,7 +43,7 @@ function TreeRender({ url, deleteurl, saveurl, onselected }) {
</Tooltip> </Tooltip>
) : ( ) : (
<Tooltip title={item.title} placement="bottom"> <Tooltip title={item.title} placement="bottom">
<span style={{ display: "inline-block", maxWidth: 68, overflow: "hidden", textOverflow: "ellipsis", whiteSpace: "nowrap" }}>{item.title}</span> <span style={{ display: "inline-block", maxWidth: 88, overflow: "hidden", textOverflow: "ellipsis", whiteSpace: "nowrap" }}>{item.title}</span>
</Tooltip> </Tooltip>
); );
...@@ -43,43 +53,16 @@ function TreeRender({ url, deleteurl, saveurl, onselected }) { ...@@ -43,43 +53,16 @@ function TreeRender({ url, deleteurl, saveurl, onselected }) {
<Divider type='vertical' style={{ margin: "0 6px" }}></Divider> <Divider type='vertical' style={{ margin: "0 6px" }}></Divider>
<Tooltip title="编辑" onClick={(e) => { <Tooltip title="编辑" onClick={(e) => {
e.stopPropagation(); e.stopPropagation();
const _it = this; setsavetitle(null)
this.setState({
savetitle: null
})
if (getPrem("enElectricityMeterType_save", "ifs")) { if (getPrem("enElectricityMeterType_save", "ifs")) {
Modal.confirm({ setModal({
icon: <></>, visible: true,
closable: true, closable: true,
title: "修改电表结构名称", title: "修改节点名称",
content: <div>
<Input placeholder={item.title} allowClear onChange={(e) => {
_it.setState({
savetitle: e.target.value
})
}}></Input>
</div>,
okText: "修改", okText: "修改",
cancelText: "取消", cancelText: "取消",
onOk: () => { placeholder: item.title,
return new Promise((resolve, reject) => { key: item.key
if (_it.state.savetitle) {
ammeterTreeSave({
electricityMeterTypeName: _it.state.savetitle,
id: item.key,
}).then(res => {
if (res.code == "0000") {
_it.resetData()
}
})
resolve()
} else {
message.warn("请输入修改的名称")
reject()
}
})
}
}) })
} }
}}> }}>
...@@ -91,46 +74,18 @@ function TreeRender({ url, deleteurl, saveurl, onselected }) { ...@@ -91,46 +74,18 @@ function TreeRender({ url, deleteurl, saveurl, onselected }) {
disabled={!getPrem("enElectricityMeterType_save", "ifs")} disabled={!getPrem("enElectricityMeterType_save", "ifs")}
onClick={(e) => { onClick={(e) => {
e.stopPropagation(); e.stopPropagation();
const _it = this; setsavetitle(null)
this.setState({
savetitle: null
})
if (getPrem("enElectricityMeterType_save", "ifs")) { if (getPrem("enElectricityMeterType_save", "ifs")) {
Modal.confirm({ setModal({
icon: <></>, visible: true,
closable: true, closable: true,
title: "新增子结构", title: "新增子结构",
content: <div>
<div style={{ marginBottom: 15, color: "#f50", fontSize: 16 }}>当前结构：{item.title}</div>
<Input placeholder="子结构" allowClear onChange={(e) => {
_it.setState({
savetitle: e.target.value
})
}}></Input>
</div>,
okText: "新增", okText: "新增",
cancelText: "取消", cancelText: "取消",
onOk: () => { placeholder: item.title,
return new Promise((resolve, reject) => { key: item.key
if (_it.state.savetitle) {
ammeterTreeSave({
electricityMeterTypeName: _it.state.savetitle,
parentId: item.key
}).then(res => {
if (res.code == "0000") {
_it.resetData()
}
})
resolve()
} else {
message.warn("请输入修改的名称")
reject()
}
})
}
}) })
} }
}} }}
style={{ color: `${getPrem("enElectricityMeterType_save", "ifs") ? "green" : ""}` }} style={{ color: `${getPrem("enElectricityMeterType_save", "ifs") ? "green" : ""}` }}
/></Tooltip> /></Tooltip>
...@@ -142,13 +97,14 @@ function TreeRender({ url, deleteurl, saveurl, onselected }) { ...@@ -142,13 +97,14 @@ function TreeRender({ url, deleteurl, saveurl, onselected }) {
(!item.children || item.children.length == 0) && (!item.children || item.children.length == 0) &&
<Popconfirm <Popconfirm
placement='bottom' placement='bottom'
title="是否删除该电表结构？" title="是否删除该节点？"
okText="删除" okText="删除"
cancelText="取消" cancelText="取消"
onConfirm={() => { onConfirm={() => {
ammeterTreeDelete({ id: item.key }).then(res => { doFetch({ url: deleteurl, params: { id: item.key } }).then(res => {
if (res.code == '0000') { if (res.code == '0000') {
this.resetData() message.success("操作成功")
refresh();
} }
}) })
}} }}
...@@ -178,9 +134,91 @@ function TreeRender({ url, deleteurl, saveurl, onselected }) { ...@@ -178,9 +134,91 @@ function TreeRender({ url, deleteurl, saveurl, onselected }) {
</TreeNode> </TreeNode>
); );
}); });
return ( return (
<div> <div>
<Search style={{ margin: '16px 0 8px 0' }} placeholder="搜索电表结构" onChange={setsearch} /> <Modal
{...modal}
onCancel={() => {
setModal(s => ({
...s,
visible: false
}))
}}
onOk={() => {
if (modal.okText == "修改") {
return new Promise((resolve, reject) => {
if (savetitle) {
console.log(ref1.current);
doFetch({
url: saveurl,
params: {
materieTypeName: savetitle,
id: modal.key,
}
}).then(res => {
if (res.code == "0000") {
message.success("操作成功")
refresh()
setModal({
visible: false
})
}
})
resolve()
} else {
message.warn("请输入修改的名称")
reject()
}
})
} else {
return new Promise((resolve, reject) => {
if (savetitle) {
doFetch({
url: saveurl,
params: {
materieTypeName: savetitle,
parentId: modal.key,
}
}).then(res => {
if (res.code == "0000") {
message.success("操作成功")
refresh()
setModal({
visible: false
})
}
})
resolve()
} else {
message.warn("请输入修改的名称")
reject()
}
})
}
}}
>
{
modal.okText == "修改" ?
<div>
<Input placeholder={modal.placeholder} allowClear value={savetitle} onChange={(e) => {
setsavetitle(e.target.value)
}}></Input>
</div> :
<div>
<div style={{ marginBottom: 15, color: "#f50", fontSize: 16 }}>当前结构：{modal.placeholder}</div>
<Input placeholder="子结构" allowClear onChange={(e) => {
setsavetitle(e.target.value)
}}></Input>
</div>
}
</Modal>
<Search value={search} style={{ margin: '16px 0 8px 0' }} placeholder="搜索" onChange={(e)=>{
setsearch(e.target.value)
}} />
<Tree <Tree
onSelect={(selectedKeys, e) => { onSelect={(selectedKeys, e) => {
......
src/pages/craft/Materiel/Index.jsx
View file @ 281248ef
import React, { useEffect, useRef, useReducer } from "react"; import React, { useState, useRef, useReducer } from "react";
import { Button, Tooltip, Row, Divider, Drawer, Form, message } from "antd"; import { Button, Tooltip, Row, Divider, Drawer, Form, message } from "antd";
import AutoTable from "@/components/AutoTable"; import AutoTable from "@/components/Tableform";
import getPrem from "@/utils/getPrem"; //权限判断fn import getPrem from "@/utils/getPrem"; //权限判断fn
import { useRequest } from "umi"; import { useRequest } from "umi";
import defaultFields from "./fields"; import defaultFields from "./fields";
...@@ -13,6 +13,7 @@ import moment from "moment"; ...@@ -13,6 +13,7 @@ import moment from "moment";
import Coltext from "@/components/Coltext"; import Coltext from "@/components/Coltext";
import RenderItemType from "@/components/RenderItemType"; import RenderItemType from "@/components/RenderItemType";
import TreeRender from '@/components/TreeRender' import TreeRender from '@/components/TreeRender'
import { set } from "lodash";
const initState = { const initState = {
vs: false, vs: false,
...@@ -32,7 +33,7 @@ const initState = { ...@@ -32,7 +33,7 @@ const initState = {
otherBasic = { otherBasic = {
materieCode: "物料编号", materieCode: "物料编号",
materieName: "物料名称", materieName: "物料名称",
materieTypeName: "物料类别", materieTypeName: "物料类型",
productionUnitName: "生产单位（主）", productionUnitName: "生产单位（主）",
processLineName: "工艺路线", processLineName: "工艺路线",
}; };
...@@ -147,6 +148,7 @@ const Materiel = (props) => { ...@@ -147,6 +148,7 @@ const Materiel = (props) => {
ChildRef = null, ChildRef = null,
[formRef] = Form.useForm(), [formRef] = Form.useForm(),
[formRefs] = Form.useForm(); [formRefs] = Form.useForm();
const [materieTypeId, setmaterieTypeId] = useState();
function reload() { function reload() {
actionRef?.current?.reload(); actionRef?.current?.reload();
ChildRef?.onRefresh(); ChildRef?.onRefresh();
...@@ -226,64 +228,69 @@ const Materiel = (props) => { ...@@ -226,64 +228,69 @@ const Materiel = (props) => {
}, },
}, },
{ {
title: "生产单位(主)", title: "物料类型",
dataIndex: "productionUnitName",
key: "productionUnitName",
},
{
title: "物料类别",
dataIndex: "materieTypeName", dataIndex: "materieTypeName",
key: "materieTypeName", key: "materieTypeName",
options: [ search: false
{
label: "自制件",
value: 0,
}, },
{ {
label: "采购件", title: "物料管控",
value: 1, dataIndex: "materieControlName",
}, key: "materieControlName",
{ options: {
label: "虚拟件", database: () => doFetch({ url: "/ngic-base-business/sysDic/queryMaterieControlSelect" }),
value: 2, params: {}
}, },
],
valueType: "select", valueType: "select",
formItemProps: { formItemProps: {
name: "materieType", name: "materieControl",
}, },
}, },
{ {
title: "物料管控", title: "工艺线路",
dataIndex: "materialControlName", dataIndex: "processLineName",
key: "materialControlName", key: "processLineName",
options: [ search: false,
{
label: "单品管控",
value: 0,
}, },
{ {
label: "批次管控", title: "保质期",
value: 1, dataIndex: "qualityGuaranteePeriod",
}, key: "qualityGuaranteePeriod",
],
valueType: "select",
formItemProps: {
name: "materialControl",
},
search: false, search: false,
render:(text,row)=>{
return row.qualityGuaranteePeriod+" "+row.qualityGuaranteePeriodUnitName
}
}, },
{ {
title: "工艺线路", title: "最大库存",
dataIndex: "processLineName", dataIndex: "inventoryMax",
key: "processLineName", key: "inventoryMax",
search: false,
}, },
{ {
title: "描述", title: "最小库存",
dataIndex: "remark", dataIndex: "inventoryMin",
key: "remark", key: "inventoryMin",
search: false, search: false,
}, },
{
title: "库存单位",
dataIndex: "productionUnitName",
key: "productionUnitName",
options: {
database: () => doFetch({ url: "/ngic-base-business/sysDic/queryMaterieUnitSelect" }),
params: {}
},
valueType: "select",
formItemProps: {
name: "productionUnit",
},
},
{ {
title: "操作", title: "操作",
dataIndex: "option_dataindex", dataIndex: "option_dataindex",
...@@ -294,7 +301,6 @@ const Materiel = (props) => { ...@@ -294,7 +301,6 @@ const Materiel = (props) => {
}, },
]; ];
function extraAction(text, record, _, action) { function extraAction(text, record, _, action) {
let ifs = record.materieType != 1;
return [ return [
getPrem("sysDepartment_save", action, "修改", () => { getPrem("sysDepartment_save", action, "修改", () => {
doFetch({ doFetch({
...@@ -335,7 +341,7 @@ const Materiel = (props) => { ...@@ -335,7 +341,7 @@ const Materiel = (props) => {
url: "/ngic-workmanship/pmMaterieChar/queryListBykey", url: "/ngic-workmanship/pmMaterieChar/queryListBykey",
params: { params: {
id: record.id, id: record.id,
materialControl: record.materialControl, materieControl: record.materieControl,
}, },
}); });
...@@ -365,209 +371,6 @@ const Materiel = (props) => { ...@@ -365,209 +371,6 @@ const Materiel = (props) => {
} }
}); });
}), }),
ifs &&
getPrem("sysDepartment_save", action, "编辑物料BOM", () => {
let all = async () => {
let mark = await doFetch({
url: "/ngic-base-business/bmSpecialSet/queryByMark",
params: { mark: "materiel_bom" },
}),
bom = await doFetch({
url: "/ngic-workmanship/pmMaterieBom/queryByMaterieParentId",
params: { materieParentId: record.id },
});
return {
markKey: mark?.data?.value,
bomData: bom?.data?.dataList,
};
};
all().then((res) => {
const { markKey, bomData } = res;
let fields = {
materieBomList: {
value: JSON.parse(JSON.stringify(bomData)),
title: "BOM信息",
type: "table",
col: { span: 14 },
name: ["materieBomList"],
required: false,
columns: [
{
title: "物料编号",
dataIndex: "materieCode",
key: "materieCode",
search: false,
ellipsis: true,
editable: false,
},
{
title: "物料名称",
dataIndex: "materieName",
key: "materieName",
search: false,
ellipsis: true,
editable: false,
},
{
title: "生产单位(主)",
dataIndex: "productionUnitName",
key: "productionUnitName",
search: false,
ellipsis: true,
editable: false,
},
{
title: "物料类别",
dataIndex: "materieTypeName",
key: "materieTypeName",
search: false,
ellipsis: true,
editable: false,
},
{
title: "台份量",
dataIndex: "numberUnits",
key: "numberUnits",
editable: true,
renderFormItem: (
item,
{ fieldProps, formItemProps },
form
) => {
return (
<RenderItemType
{...fieldProps}
type={"inputnumber"}
rowKey={item.entry.rowKey}
/>
);
},
width: 100,
formItemProps: (form, config) => {
return {
rules: [{ required: true, message: "此项为必填项" }],
};
},
},
{
title: "产出工序",
dataIndex: "workingProduceId",
key: "workingProduceId",
valueType: "select",
width: 150,
formItemProps: (form, config) => {
return {
rules:
markKey == 2 || config.entry.materieType == 1
? []
: [{ required: true, message: "此项为必填项" }],
};
},
renderFormItem: (item, { fieldProps }, form) => {
if (item.entry.materieType == 1 || markKey == 2) {
return <></>;
} else {
return (
<RenderItemType
{...fieldProps}
type={"select"}
selectarr={item.entry.workingProduceList ?? []}
rowKey={item.entry.rowKey}
/>
);
}
},
},
{
title: "投料工序",
dataIndex: "workingFeedingId",
key: "workingFeedingId",
valueType: "select",
width: 150,
formItemProps: (form, config) => {
return {
rules:
markKey == 2
? []
: [{ required: true, message: "此项为必填项" }],
};
},
renderFormItem: (item, { fieldProps }, form) => {
if (markKey == 2) {
return <></>;
} else {
return (
<RenderItemType
{...fieldProps}
type={"select"}
selectarr={item.entry.workingFeedingList ?? []}
rowKey={item.entry.rowKey}
/>
);
}
},
},
{
title: "操作",
valueType: "option",
width: 70,
render: (text, record, _, action) => [
<a key="delete">删除</a>,
],
},
],
rowKey: "rowKey",
recordCreatorProps: "false",
},
materieList: {
value: [],
type: "checktable",
title: "物料信息",
name: ["materieList"],
required: false,
columns: [
{
title: "物料编号",
dataIndex: "materieCode",
key: "materieCode",
},
{
title: "物料名称",
dataIndex: "materieName",
key: "materieName",
},
{
title: "生产单位(主)",
dataIndex: "productionUnitName",
key: "productionUnitName",
search: false,
},
{
title: "物料类别",
dataIndex: "materieTypeName",
key: "materieTypeName",
search: false,
},
{
title: "描述",
dataIndex: "remark",
key: "remark",
search: false,
},
],
editable: true,
path: "/ngic-workmanship/pmMaterie/queryBomById",
extraparams: { id: record.id },
rowKey: "id",
rowName: "materieName",
tabletype: "checkbox",
pageSize: 10,
col: { span: 10 },
},
};
dispatch({ type: "bom", fields, curitem: record, markKey });
});
}),
getPrem("sysDepartment_deleteById", action, "删除", null, { getPrem("sysDepartment_deleteById", action, "删除", null, {
title: "确认删除该物料？", title: "确认删除该物料？",
onConfirm: () => { onConfirm: () => {
...@@ -669,7 +472,6 @@ const Materiel = (props) => { ...@@ -669,7 +472,6 @@ const Materiel = (props) => {
let extrarender = [ let extrarender = [
<Button <Button
disabled={!getPrem("sysDepartment_save", "ifs")} disabled={!getPrem("sysDepartment_save", "ifs")}
style={{ marginRight: 15 }}
type="primary" type="primary"
onClick={() => { onClick={() => {
doFetch({ doFetch({
...@@ -684,7 +486,7 @@ const Materiel = (props) => { ...@@ -684,7 +486,7 @@ const Materiel = (props) => {
defaultFields[i].value = null; defaultFields[i].value = null;
defaultFields[i].disabled = false; defaultFields[i].disabled = false;
if ( if (
i == "materialControl" || i == "materieControl" ||
i == "serialNumberRuleId" || i == "serialNumberRuleId" ||
i == "labelTemplateId" || i == "labelTemplateId" ||
i == "processLineId" i == "processLineId"
...@@ -754,15 +556,20 @@ const Materiel = (props) => { ...@@ -754,15 +556,20 @@ const Materiel = (props) => {
path="/ngic-workmanship/pmMaterie/queryList" path="/ngic-workmanship/pmMaterie/queryList"
actionRef={actionRef} actionRef={actionRef}
onRef={(node) => (ChildRef = node)} onRef={(node) => (ChildRef = node)}
childposition="left"
extraparams={{ materieTypeId: materieTypeId }}
> >
<div style={{ width: 260, flexShrink: 0, marginTop: -4, borderRight: "1px solid #f0f0f0", paddingRight: 12, marginRight: 12 }}>
<TreeRender <TreeRender
url="/ngic-workmanship/pmMaterieType/queryTreeList" url="/ngic-workmanship/pmMaterieType/queryTreeList"
deleteurl="/ngic-workmanship/pmMaterieType/deleteById" deleteurl="/ngic-workmanship/pmMaterieType/deleteById"
saveurl="/ngic-workmanship/materieType/save" saveurl="/ngic-workmanship/pmMaterieType/save"
onselected={(vals)=>{ onselected={(vals) => {
console.log(vals); setmaterieTypeId(vals[0] ?? '')
}} }}
/> />
</div>
</AutoTable> </AutoTable>
<Drawer <Drawer
...@@ -806,44 +613,6 @@ const Materiel = (props) => { ...@@ -806,44 +613,6 @@ const Materiel = (props) => {
materieBomList: [...newDatas], materieBomList: [...newDatas],
materieList: [], materieList: [],
}); });
// let newFields = JSON.parse(JSON.stringify(fields));
// for (let i in newFields) {
// if (i == "materieBomList") {
// newFields[i].columns[4].renderFormItem = (item, { fieldProps, formItemProps }, form) => {
// return <RenderItemType {...fieldProps} type={'inputnumber'} rowKey={item.entry.rowKey} />;
// };
// newFields[i].columns[5].renderFormItem = (item, { fieldProps }, form) => {
// if (item.entry.materieType == 1 || markKey == 2) {
// return (
// <></>
// );
// } else {
// return <RenderItemType
// {...fieldProps}
// type={'select'}
// selectarr={item.entry.workingProduceList ?? []}
// rowKey={item.entry.rowKey}
// />
// }
// };
// newFields[i].columns[6].renderFormItem = (item, { fieldProps }, form) => {
// if (markKey == 2) {
// return (
// <></>
// );
// } else {
// return <RenderItemType
// {...fieldProps}
// type={'select'}
// selectarr={item.entry.workingFeedingList ?? []}
// rowKey={item.entry.rowKey}
// />
// }
// };
// newFields[i].value = [...newDatas]
// }
// }
// dispatch({ type: "changeFields", fields: { ...newFields } });
}} }}
> >
添加至Bom信息 添加至Bom信息
...@@ -864,11 +633,11 @@ const Materiel = (props) => { ...@@ -864,11 +633,11 @@ const Materiel = (props) => {
fields={fields} fields={fields}
onChange={(changedValues, allValues) => { onChange={(changedValues, allValues) => {
for (let i in changedValues) { for (let i in changedValues) {
if (i == "materialControl") { if (i == "materieControl") {
doFetch({ doFetch({
url: "/ngic-workmanship/pmMaterieChar/queryListBykey", url: "/ngic-workmanship/pmMaterieChar/queryListBykey",
params: { params: {
materialControl: changedValues[i], materieControl: changedValues[i],
id: iftype.val == "edit" ? curitem.id : "", id: iftype.val == "edit" ? curitem.id : "",
}, },
}).then((res) => { }).then((res) => {
...@@ -893,7 +662,7 @@ const Materiel = (props) => { ...@@ -893,7 +662,7 @@ const Materiel = (props) => {
if (i == "materieType") { if (i == "materieType") {
for (let j in fields) { for (let j in fields) {
if ( if (
j == "materialControl" || j == "materieControl" ||
j == "serialNumberRuleId" || j == "serialNumberRuleId" ||
j == "processLineId" || j == "processLineId" ||
j == "labelTemplateId" j == "labelTemplateId"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment