Skip to content

W
wms
Commit b5ef4290 authored by krysent's avatar krysent
Browse files
Options

new

parent b77cf01b
Hide whitespace changes
Inline Side-by-side
Showing with 181 additions and 150 deletions
src/components/InitForm/index.jsx
View file @ b5ef4290
......@@ -1005,6 +1005,7 @@ let InitForm = ({
max={item.max}
formatter={item.formatter}
parser={item.parser}
precision={item.precision}
/>
</Form.Item>
</Col>
......
src/components/TreeRender/index.jsx
View file @ b5ef4290
......@@ -51,6 +51,7 @@ function TreeRender({
params,
noaction,
maxWidth,
hasTool = false,
}) {
const [search, setsearch] = useState("");
const [savetitle, setsavetitle] = useState(null);
......@@ -164,101 +165,112 @@ function TreeRender({
}}
>
{title}
<div>
{item.key && item.key != "00000000" && (
<Tooltip
title="编辑"
onClick={(e) => {
e.stopPropagation();
setsavetitle(null);
if (getPrem("enElectricityMeterType_save", "ifs")) {
setModal({
visible: true,
closable: true,
title: "修改节点名称",
okText: "修改",
cancelText: "取消",
placeholder: item.title,
key: item.key,
});
}
}}
>
<FormOutlined style={{ color: "#1890ff" }} />
</Tooltip>
)}
{(item.key && item.key != "00000000") && (
<Divider type="vertical" style={{ margin: "0 6px" }}></Divider>
)}
<Tooltip title="新增">
<PlusSquareOutlined
disabled={!getPrem("enElectricityMeterType_save", "ifs")}
onClick={(e) => {
e.stopPropagation();
setsavetitle(null);
if (getPrem("enElectricityMeterType_save", "ifs")) {
setModal({
visible: true,
closable: true,
title: "新增子结构",
okText: "新增",
cancelText: "取消",
placeholder: item.title,
key: item.key,
});
}
}}
style={{
color: `${
getPrem("enElectricityMeterType_save", "ifs") ? "green" : ""
}`,
}}
/>
</Tooltip>
{(!item.children || item.children.length == 0) && (
<Divider type="vertical" style={{ margin: "0 6px" }}></Divider>
)}
{(!item.children || item.children.length == 0) && item.key != "0" && (
<Popconfirm
placement="bottom"
title="是否删除该节点？"
okText="删除"
cancelText="取消"
onConfirm={() => {
doFetch({ url: deleteurl, params: { id: item.key } }).then(
(res) => {
if (res.code == "0000") {
message.success("操作成功");
refresh();
}
{hasTool && (
<div>
{item.key && item.key != "00000000" && (
<Tooltip
title="编辑"
onClick={(e) => {
e.stopPropagation();
setsavetitle(null);
if (getPrem("enElectricityMeterType_save", "ifs")) {
setModal({
visible: true,
closable: true,
title: "修改节点名称",
okText: "修改",
cancelText: "取消",
placeholder: item.title,
key: item.key,
});
}
}}
>
<FormOutlined style={{ color: "#1890ff" }} />
</Tooltip>
)}
{item.key && item.key != "00000000" && (
<Divider type="vertical" style={{ margin: "0 6px" }}></Divider>
)}
<Tooltip title="新增">
<PlusSquareOutlined
disabled={!getPrem("enElectricityMeterType_save", "ifs")}
onClick={(e) => {
e.stopPropagation();
setsavetitle(null);
if (getPrem("enElectricityMeterType_save", "ifs")) {
setModal({
visible: true,
closable: true,
title: "新增子结构",
okText: "新增",
cancelText: "取消",
placeholder: item.title,
key: item.key,
});
}
);
}}
disabled={!getPrem("enElectricityMeterType_deleteById", "ifs")}
>
<Tooltip title="删除">
<MinusSquareOutlined
onClick={(e) => {
e.stopPropagation();
}}
style={{
color: `${
getPrem("enElectricityMeterType_save", "ifs")
? "green"
: ""
}`,
}}
/>
</Tooltip>
{(!item.children || item.children.length == 0) && (
<Divider type="vertical" style={{ margin: "0 6px" }}></Divider>
)}
{(!item.children || item.children.length == 0) &&
item.key != "0" && (
<Popconfirm
placement="bottom"
title="是否删除该节点？"
okText="删除"
cancelText="取消"
onConfirm={() => {
doFetch({
url: deleteurl,
params: { id: item.key },
}).then((res) => {
if (res.code == "0000") {
message.success("操作成功");
refresh();
}
});
}}
style={{ color: "red" }}
/>
disabled={
!getPrem("enElectricityMeterType_deleteById", "ifs")
}
>
<Tooltip title="删除">
<MinusSquareOutlined
onClick={(e) => {
e.stopPropagation();
}}
style={{ color: "red" }}
/>
</Tooltip>
</Popconfirm>
)}
{item.key === "00000000" && (
<Divider type="vertical" style={{ margin: "0 6px" }}></Divider>
)}
{item.key === "00000000" && (
<Tooltip
title={expandall ? "收起" : "展开"}
onClick={(e) => {
e.stopPropagation();
setexpandall(!expandall);
onExpand(expandall ? [] : allkeys);
}}
>
{expandall ? <ArrowDownOutlined /> : <ArrowRightOutlined />}
</Tooltip>
</Popconfirm>
)}
{/* {
item.key === "00000000" && <Divider type='vertical' style={{ margin: "0 6px" }}></Divider>
} */}
{/* {
item.key === "00000000" && <Tooltip title={expandall ? "收起" : "展开"} onClick={(e) => {
e.stopPropagation();
setexpandall(!expandall)
onExpand(expandall ? [] : allkeys)
}}>
{expandall ? <ArrowDownOutlined /> : <ArrowRightOutlined />}
</Tooltip>
} */}
</div>
)}
</div>
)}
</div>
);
if (item.key === "00000000") {
......
src/pages/craft/Materiel/fields.js
View file @ b5ef4290
import { selectionBoxAll, StoreAreaselection ,factorySelect,storeselectionBoxAll} from "@/services/system.js";
import {
selectionBoxAll,
StoreAreaselection,
factorySelect,
storeselectionBoxAll,
} from "@/services/system.js";
import { doFetch } from "@/utils/doFetch";
export default {
......@@ -38,7 +43,7 @@ export default {
},
},
materieControl: {
value: null,
value: "1",
type: "select",
title: "管控方式",
name: ["materieControl"],
......@@ -60,6 +65,7 @@ export default {
required: true,
},
issueType: {
value:"2",
type: "select",
title: "发料类型",
name: ["issueType"],
......@@ -80,29 +86,32 @@ export default {
name: ["scsx"],
},
ironLoss: {
value: null,
value: 0,
type: "inputnumber",
title: "铁损",
name: ["ironLoss"],
required: false,
precision: 3,
},
sheetThickness: {
value: null,
value: 0,
type: "inputnumber",
title: "片厚",
name: ["sheetThickness"],
required: false,
precision: 3,
},
unilateralThickness: {
value: null,
value: 0,
type: "inputnumber",
title: "宽度",
name: ["unilateralThickness"],
required: false,
precision: 3,
},
shopSign: {
value: null,
type: "inputnumber",
type: "input",
title: "牌号",
name: ["shopSign"],
required: false,
......@@ -118,7 +127,7 @@ export default {
type: "select",
title: "库存单位",
name: ["productionUnit"],
required: true,
required: false,
options: {
database: (params) =>
doFetch({
......@@ -133,7 +142,7 @@ export default {
type: "select",
title: "默认仓库",
name: ["storeId"],
linked:true,
linked: true,
required: false,
options: {
database: selectionBoxAll,
......@@ -185,6 +194,4 @@ export default {
// },
// },
// },
};
src/pages/craft/Materiel/index.jsx
View file @ b5ef4290
......@@ -175,57 +175,56 @@ const Materiel = (props) => {
title: "物料名称",
dataIndex: "materieName",
key: "materieName",
render: (_, row) => {
return (
<Tooltip title={row.materieName}>
<a
className="table-cell"
onClick={() => {
doFetch({
url: "/ngic-workmanship/pmMaterie/queryDetailById",
params: { id: row.id },
}).then((res) => {
if (res.code == "0000") {
let dataSource = res?.data?.data ?? {},
specials = res?.data?.data?.materieCharList ?? [];
let newData = formatFieds(specials, "special")?.data;
// render: (_, row) => {
// return (
// <Tooltip title={row.materieName}>
// <a
// className="table-cell"
// onClick={() => {
// doFetch({
// url: "/ngic-workmanship/pmMaterie/queryDetailById",
// params: { id: row.id },
// }).then((res) => {
// if (res.code == "0000") {
// let dataSource = res?.data?.data ?? {},
// specials = res?.data?.data?.materieCharList ?? [];
// let newData = formatFieds(specials, "special")?.data;
let newSpecialData = newData.map((it) => {
dataSource[it.fieldsKey] = it.fieldRealValue;
return {
title: it.fieldName,
key: it.fieldsKey,
};
});
let itemCol = [
{
cardTitle: "特殊属性",
itemData: newSpecialData,
},
];
dataSource.newqualityGuaranteePeriod =
dataSource.qualityGuaranteePeriod == 0 ||
dataSource.qualityGuaranteePeriod
? dataSource.qualityGuaranteePeriod +
dataSource.qualityGuaranteePeriodUnitName
: null;
let totalCard = materielDetail.concat(itemCol);
dispatch({ type: "see", dataSource, totalCard });
}
});
}}
>
{row.materieName}
</a>
</Tooltip>
);
},
// let newSpecialData = newData.map((it) => {
// dataSource[it.fieldsKey] = it.fieldRealValue;
// return {
// title: it.fieldName,
// key: it.fieldsKey,
// };
// });
// let itemCol = [
// {
// cardTitle: "特殊属性",
// itemData: newSpecialData,
// },
// ];
// dataSource.newqualityGuaranteePeriod =
// dataSource.qualityGuaranteePeriod == 0 ||
// dataSource.qualityGuaranteePeriod
// ? dataSource.qualityGuaranteePeriod +
// dataSource.qualityGuaranteePeriodUnitName
// : null;
// let totalCard = materielDetail.concat(itemCol);
// dispatch({ type: "see", dataSource, totalCard });
// }
// });
// }}
// >
// {row.materieName}
// </a>
// </Tooltip>
// );
// },
},
{
title: "物料类型",
dataIndex: "materieTypeName",
key: "materieTypeName",
search: false,
},
{
title: "管控方式",
......@@ -528,6 +527,7 @@ const Materiel = (props) => {
url="/ngic-workmanship/pmMaterieType/queryTreeList"
deleteurl="/ngic-workmanship/pmMaterieType/deleteById"
saveurl="/ngic-workmanship/pmMaterieType/save"
hasTool={true}
onselected={(vals) => {
setmaterieTypeId(vals[0] ?? "");
}}
......
src/pages/system/Area/index.jsx
View file @ b5ef4290
......@@ -117,7 +117,7 @@ const Store = (props) => {
"dataIndex": "remark",
"key": "remark",
"valueType": "textarea",
search:false
},
{
title: "操作",
......
src/pages/system/Reservoir/index.jsx
View file @ b5ef4290
......@@ -11,6 +11,7 @@ import InitForm from "@/components/InitForm";
import moment from "moment";
import TreeRender from "@/components/TreeRender";
import { useEffect } from "react";
import {storeselectionBoxAll} from '@/services/system.js'
const initState = {
vs: false,
......@@ -225,6 +226,13 @@ const Materiel = (props) => {
title: "所属仓库",
dataIndex: "storeName",
key: "storeName",
valueType:'select',
options: {
database: storeselectionBoxAll,
params: {
factoryId: "linked",
},
},
},
{
title: "所属库区",
......@@ -247,18 +255,21 @@ const Materiel = (props) => {
dataIndex: "row",
key: "row",
valueType: "digit",
search: false,
},
{
title: "列",
dataIndex: "line",
key: "line",
valueType: "digit",
search: false,
},
{
title: "层",
dataIndex: "level",
key: "level",
valueType: "digit",
search: false,
},
{
title: "状态",
......@@ -534,8 +545,8 @@ const Materiel = (props) => {
>
<TreeRender
url="/ngic-auth/sysFactory/queryFactoryStoreTree"
deleteurl="/ngic-auth/sysFactory/deleteById"
saveurl="/ngic-auth/sysFactory/save"
// deleteurl="/ngic-auth/sysFactory/deleteById"
// saveurl="/ngic-auth/sysFactory/save"
onselected={(vals) => {
setmaterieTypeId(vals[0] ?? "");
}}
......
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