Skip to content

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

new

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