diff --git a/src/components/Details/detail.jsx b/src/components/Details/detail.jsx index 8c9262ceb205b9fdb6ee05b71e91acd672d2e25a..a10f668962df8f84703c354962029da3dd2d8e86 100644 --- a/src/components/Details/detail.jsx +++ b/src/components/Details/detail.jsx @@ -42,6 +42,7 @@ const Details = (props) => { topNode, printRef, onloadeddata, + reload } = props; const [pageData, cp] = useState({}); @@ -98,8 +99,8 @@ const Details = (props) => { <pre className={col ? "" : styles.one}>{value}</pre> </Tooltip> ) : ( - <div>-</div> - ); + <div>-</div> + ); } else if (type == "file") { return ( <div style={{ display: "flex", flexFlow: "row wrap", width: "100%" }}> @@ -125,26 +126,24 @@ const Details = (props) => { ); }) ) : ( - "-" - )} + "-" + )} </div> ); } else if (type == "img") { return ( <div style={{ display: "flex", flexFlow: "row wrap" }}> - {value && value?.length - ? value?.map((el) => { - return ( - <Image - style={{ margin: "0 10px 0 0" }} - src={el?.url} - width={30} - height={30} - key={el?.uid} - ></Image> - ); - }) - : "-"} + { + value ? + Array.isArray(value) && value.length > 0 ? + value?.map(el => { + return <Image style={{ margin: '0 10px 0 0' }} src={el?.url} width={30} height={30} key={el?.uid}></Image> + }) + : + <Image style={{ margin: '0 10px 0 0' }} src={value} width={itemData.width ?? 30} height={itemData.height ?? 30}></Image> + : + "-" + } </div> ); } else if (type == "table") { @@ -227,7 +226,12 @@ const Details = (props) => { extra={item?.extra ? <Button type="primary" onClick={() => { doFetch({ url: item.extrapath, params: initialState[item.extrakey] }).then(res => { if (res.code == "0000") { - message.success("æ“作æˆåŠŸ") + if (reload) { + reload && reload() + } else { + message.success("æ“作æˆåŠŸ"); + } + } }) }}>ä¿å˜</Button> : null} diff --git a/src/components/Details/index.jsx b/src/components/Details/index.jsx index 9e5517a8ae0894960232394f0defe98fd8b838bc..fec9c5262d150841a30560071ad61395911a57fb 100644 --- a/src/components/Details/index.jsx +++ b/src/components/Details/index.jsx @@ -69,16 +69,16 @@ const Details = (props) => { //èŽ·å–æ¯ä¸€é¡¹ const getItem = (itemData) => { const { - type, - key, - title, - columns, - path, - urlName, - col, - rowKey, - expandable, - } = itemData, + type, + key, + title, + columns, + path, + urlName, + col, + rowKey, + expandable, + } = itemData, value = dataSource[key]; if (!type || type == "input") { return value == 0 || value ? ( @@ -86,8 +86,8 @@ const Details = (props) => { <pre className={col ? "" : styles.one}>{value}</pre> </Tooltip> ) : ( - <div>-</div> - ); + <div>-</div> + ); } else if (type == "file") { return ( <div style={{ display: "flex", flexFlow: "row wrap", width: "100%" }}> @@ -113,26 +113,24 @@ const Details = (props) => { ); }) ) : ( - "-" - )} + "-" + )} </div> ); } else if (type == "img") { return ( <div style={{ display: "flex", flexFlow: "row wrap" }}> - {value && value?.length - ? value?.map((el) => { - return ( - <Image - style={{ margin: "0 10px 0 0" }} - src={el?.url} - width={30} - height={30} - key={el?.uid} - ></Image> - ); - }) - : "-"} + { + value ? + Array.isArray(value) && value.length > 0 ? + value?.map(el => { + return <Image style={{ margin: '0 10px 0 0' }} src={el?.url} width={30} height={30} key={el?.uid}></Image> + }) + : + <Image style={{ margin: '0 10px 0 0' }} src={value} width={itemData.width ?? 30} height={itemData.height ?? 30}></Image> + : + "-" + } </div> ); } else if (type == "table") { diff --git a/src/components/DrawInitForm/index.jsx b/src/components/DrawInitForm/index.jsx index 8e209571310fcd81df467f05ef0b380d1471cc4a..44f636b4384639014d1595e75c3241c161abf1c7 100644 --- a/src/components/DrawInitForm/index.jsx +++ b/src/components/DrawInitForm/index.jsx @@ -28,7 +28,8 @@ function DrawInitForm(props) { topNode: props.topNode, printRef: props.printRef, onloadeddata: props.onloadeddata, - expandkeys: props.expandkeys + expandkeys: props.expandkeys, + reload:props.reload } return ( <Drawer diff --git a/src/pages/insertstore/Instore/fields.js b/src/pages/insertstore/Instore/fields.js index 943618e3146a4fad7770062782ee803913804ca9..51ec4fbe0dfe4f31fc73b370c996895799e61287 100644 --- a/src/pages/insertstore/Instore/fields.js +++ b/src/pages/insertstore/Instore/fields.js @@ -20,9 +20,10 @@ const EditUpload = ({ record, fid, storeId }) => { id: fid, materialList: Object.keys(value)?.map?.(it => { let id = it; + let newArr = value[id]?.filter(it=>it.id) ?? []; return { id, - uploadList: value[id]?.map(its => { + uploadList: newArr.map(its => { return { storePositionId: its?.storePositionId, instroeNum: its?.instroeNum, @@ -703,6 +704,11 @@ const one = { title: "状æ€", key: "statusName", }, + { + title: "å·¥å•二维ç ", + key: "qrCodeUrl", + type:"img" + }, ], }, { @@ -924,6 +930,10 @@ const one = { title: "创建时间", key: "createTime", }, + { + title: "状æ€", + key: "statusName", + } ], }, { diff --git a/src/pages/insertstore/Instore/index.jsx b/src/pages/insertstore/Instore/index.jsx index 1b04c5f8867206b4c85baea96de85e6f9fcaaeee..d81eb171d49be1c08645fe4c8be13356b246c7fa 100644 --- a/src/pages/insertstore/Instore/index.jsx +++ b/src/pages/insertstore/Instore/index.jsx @@ -401,6 +401,7 @@ function Instore(props) { } } }} + reload={reload} /> </div> ); diff --git a/src/pages/platform/Provide/index.jsx b/src/pages/platform/Provide/index.jsx index 1ac4184676313cb7f8afeddddeb8570d3d49d8f1..853215e4f815f85f30c322d2cdf2089cf3f30286 100644 --- a/src/pages/platform/Provide/index.jsx +++ b/src/pages/platform/Provide/index.jsx @@ -182,7 +182,7 @@ const Deviceprovide = (props) => { }} okText="确定" cancelText="å–æ¶ˆ" - disabled={!getPrem("equipmentSupplier_updatestatus", "ifs")} + disabled={!getPrem("equipmentSupplier_updatestatus", "ifs") || row.sourceType==1} > < Switch checked={row.status == 1 ? true : false} checkedChildren="å¼€å¯" unCheckedChildren="å…³é—" defaultChecked={false} /> </Popconfirm> @@ -250,6 +250,7 @@ const Deviceprovide = (props) => { <Button disabled={!getPrem("equipmentSupplier_save", "ifs")} type="primary" onClick={() => { for (let i in defaultFields) { defaultFields[i].value = null; + defaultFields[i].disabled = false; if (i == "supplierUserList") { defaultFields[i].value = [] } @@ -276,6 +277,11 @@ const Deviceprovide = (props) => { let data = res?.data?.data || {}; for (let i in defaultFields) { defaultFields[i].value = data[i]; + if (i == "status" && curitem.sourceType==1) { + defaultFields[i].disabled = true; + }else{ + defaultFields[i].disabled = false; + } } dispatch({ type: "edit", fields: { ...defaultFields, ...result?.fields } }) }