diff --git a/config/proxy.js b/config/proxy.js
index 0f61e3323de95ccd77dbccc97b1e4655c9508fa3..2bd6b42cf3740058be6ae387994724658964bb69 100644
--- a/config/proxy.js
+++ b/config/proxy.js
@@ -11,7 +11,7 @@ export default {
// localhost:8000/api/** -> https://preview.pro.ant.design/api/**
"/wms/": {
// è¦ä»£ç†çš„地å€
- target: "http://192.168.40.102:28040/", //39:18040 23/wms/ //60 ç¿” //18
+ target: "http://192.168.40.114:28040/", //39:18040 23/wms/ //60 ç¿” //18
changeOrigin: true,
pathRewrite: {
"^/wms": "",
diff --git a/src/components/EditTable/index.jsx b/src/components/EditTable/index.jsx
index 8b20e896588bc914bfe6586684837e32d4be4ffe..b38c838b81905d5ecb2e59a2251b1bdbadbf92a7 100644
--- a/src/components/EditTable/index.jsx
+++ b/src/components/EditTable/index.jsx
@@ -68,12 +68,12 @@ const EditTable = ({
//å‚数获å–
let parames = {};
- let ifs = false;
+ let ifs = true;
Object.keys(params).map(it => {
if (params[it] == "linked") {
parames[it] = record[it]
- if (record[it] == curvaluerow[it]) {
- ifs = true;
+ if (record[it] != curvaluerow[it]) {
+ ifs = false;
}
} else {
parames[it] = params[it]
@@ -89,7 +89,8 @@ const EditTable = ({
newvalue = newvalue.map((it, i) => {
if (it[rowKey] == record[rowKey]) {
Object.keys(effectresult).map(items => {
- it[items] = res?.data?.data[effectresult[items]];
+ let result = res?.data?.data ?? {}
+ it[items] = result[effectresult[items]];
})
}
editorFormRef.current?.setRowData?.(i, it)
diff --git a/src/pages/insertstore/Instore/fields.js b/src/pages/insertstore/Instore/fields.js
index e93db7813c85463236ab15ed3ee3d846993f78bd..28c75c12e3e27b13368ab3f49b9fde2c6610d0a4 100644
--- a/src/pages/insertstore/Instore/fields.js
+++ b/src/pages/insertstore/Instore/fields.js
@@ -5,10 +5,14 @@ import { EditableProTable } from "@ant-design/pro-table";
import { useEffect, useState } from 'react'
import { useModel } from 'umi'
-const EditUpload = ({ record, fid }) => {
- const [value, setvalue] = useState({});
+const EditUpload = ({ record, fid ,storeId}) => {
+ const [value, setvalue] = useState({
+ [record.id]: record.uploadList
+ });
const { initialState, setInitialState } = useModel("@@initialState");
-
+ console.log('====================================');
+ console.log(storeId);
+ console.log('====================================');
useEffect(() => {
if (!value) {
return
@@ -40,12 +44,12 @@ const EditUpload = ({ record, fid }) => {
columns={[
{
title: "库ä½å称",
- dataIndex: "storeName",
+ dataIndex: "storePositionName",
key: "storePositionId",
search: false,
valueType: "select",
request: async () => {
- let res = await doFetch({ url: "/ngic-auth/sysStorePosition/queryByStoreId/selection", params: { storeId: record.storeId } });
+ let res = await doFetch({ url: "/ngic-auth/sysStorePosition/queryByStoreId/selection", params: { storeId: storeId } });
return res?.data?.dataList
},
editable: (text, record, index) => {
@@ -81,7 +85,7 @@ const EditUpload = ({ record, fid }) => {
],
}
]}
- value={[...(record.downloadList ?? []), ...(value[record.id] ?? [])]}
+ value={value[record.id]}
recordCreatorProps={{
newRecordType: "dataSource",
record: () => ({
@@ -733,8 +737,8 @@ const one = {
columns={[
{
title: "库ä½å称",
- dataIndex: "storeName",
- key: "storeName",
+ dataIndex: "storePositionName",
+ key: "storePositionName",
search: false,
},
{
@@ -744,7 +748,7 @@ const one = {
search: false,
}
]}
- dataSource={record.downloadList}
+ dataSource={record.uploadList}
pagination={false}
/>,
},
@@ -767,7 +771,7 @@ const one = {
},
{
cardTitle: "上架明细",
- noPrint:true,
+ noPrint: true,
itemData: [
{
key: "materialUploadList",
@@ -818,8 +822,8 @@ const one = {
columns={[
{
title: "库ä½å称",
- dataIndex: "storeName",
- key: "storeName",
+ dataIndex: "storePositionName",
+ key: "storePositionName",
search: false,
},
{
@@ -850,7 +854,7 @@ const one = {
search: false,
}
]}
- dataSource={record.downloadList}
+ dataSource={record.uploadList}
pagination={false}
/>,
},
@@ -859,7 +863,7 @@ const one = {
],
},
]
- }, doinsert = (fid) => ({
+ }, doinsert = (fid,storeId) => ({
totalCard: [
//物料详情
{
@@ -944,7 +948,7 @@ const one = {
},
],
expandable: {
- expandedRowRender: record => <EditUpload record={record} fid={fid} />,
+ expandedRowRender: record => <EditUpload record={record} fid={fid} storeId={storeId}/>,
}
},
],
diff --git a/src/pages/insertstore/Instore/index.jsx b/src/pages/insertstore/Instore/index.jsx
index 13a45ae495342a5a4393146be44705b2d9726dd7..1b952a1e0705798476f2b88039fc0ddf3dee50be 100644
--- a/src/pages/insertstore/Instore/index.jsx
+++ b/src/pages/insertstore/Instore/index.jsx
@@ -211,7 +211,7 @@ function Instore(props) {
"render": (text, record, _, action) => {
return [
getPrem("equipmentCustomer_save", action, '上架采集', async () => {
- let extra = defaultFields.doinsert(record.id);
+ let extra = defaultFields.doinsert(record.id,record.storeId);
setdrawprops(s => ({
...s,
visible: true,
diff --git a/src/pages/outsetstore/Outstore/fields.js b/src/pages/outsetstore/Outstore/fields.js
index f69063182437e60605f84d01bd981a27b257ffc1..087283939753b06b819887ad6fa3bc1a3e104cf5 100644
--- a/src/pages/outsetstore/Outstore/fields.js
+++ b/src/pages/outsetstore/Outstore/fields.js
@@ -5,10 +5,14 @@ import EditTable from "@/components/EditTable";
import { useEffect, useState } from 'react'
import { useModel } from 'umi'
-const EditUpload = ({ record, fid }) => {
- const [value, setvalue] = useState({});
+const EditUpload = ({ record, fid, storeId }) => {
+ const [value, setvalue] = useState({
+ [record.id]: record.downloadList
+ });
const { initialState, setInitialState } = useModel("@@initialState");
-
+ console.log('====================================');
+ console.log(storeId);
+ console.log('====================================');
useEffect(() => {
if (!value) {
return
@@ -40,10 +44,11 @@ const EditUpload = ({ record, fid }) => {
linkconfig={{
urlchangeval: {
database: (params) => doFetch({ url: "/ngic-workmanship/wmsMaterieStore/queryStoreOne", params }),
- params: { "materieId": "linked" },
+ params: { "storePositionId": "linked", "materieControlNo": "linked" },
effectresult: {
- "productionUnit": "productionUnit",
- "productionUnitName": "productionUnitName"
+ "supplierNo": "supplierNo",
+ "supplierName": "supplierName",
+ "productionNum": "productionNum",
}
}
}}
@@ -51,12 +56,12 @@ const EditUpload = ({ record, fid }) => {
columns={[
{
title: "库ä½å称",
- dataIndex: "storeName",
+ dataIndex: "storePositionName",
key: "storePositionId",
search: false,
valueType: "select",
request: async () => {
- let res = await doFetch({ url: "/ngic-auth/sysStorePosition/queryByStoreId/selection", params: { storeId: record.storeId } });
+ let res = await doFetch({ url: "/ngic-auth/sysStorePosition/queryByStoreId/selection", params: { storeId: storeId } });
return res?.data?.dataList
},
editable: (text, record, index) => {
@@ -86,7 +91,10 @@ const EditUpload = ({ record, fid }) => {
dataIndex: "supplierNo",
key: "supplierNo",
search: false,
- "readonly": true,
+ readonly: true,
+ render: (dom, row) => {
+ return (row?.supplierNo ?? '') + " - " + (row?.supplierName ?? '')
+ }
},
{
title: "库å˜æ•°é‡",
@@ -115,7 +123,7 @@ const EditUpload = ({ record, fid }) => {
],
}
]}
- value={[...(record.downloadList ?? []), ...(value[record.id] ?? [])]}
+ value={value[record.id]}
onChange={(vals) => {
setvalue(s => ({
...s,
@@ -682,8 +690,8 @@ const one = {
columns={[
{
title: "库ä½å称",
- dataIndex: "storeName",
- key: "storeName",
+ dataIndex: "storePositionName",
+ key: "storePositionName",
search: false,
},
{
@@ -716,9 +724,115 @@ const one = {
},
],
},
+ {
+ cardTitle: "强制关é—ä¿¡æ¯",
+ itemData: [
+ {
+ title: "æ“作人",
+ key: "closeUserName",
+ },
+ {
+ title: "æ“作时间",
+ key: "closeTime",
+ }
+ ],
+ },
+ {
+ cardTitle: "下架明细",
+ noPrint: true,
+ itemData: [
+ {
+ key: "materialDownloadList",
+ type: "table",
+ col: { span: 24 },
+ columns: [
+ {
+ title: "物料编ç - å称",
+ dataIndex: "materieName",
+ key: "materieName",
+ search: false,
+ render: (dom, row) => {
+ return (row.materieCode ?? '') + " - " + (row.materieName ?? '')
+ }
+ },
+ {
+ title: "出库数é‡",
+ dataIndex: "outstroeNum",
+ key: "outstroeNum",
+ search: false,
+ },
+ {
+ title: "å•ä½",
+ dataIndex: "productionUnitName",
+ key: "productionUnitName",
+ search: false,
+ },
+ ],
+ expandable: {
+ defaultExpandAllRows: true,
+ expandedRowRender: record => <Table
+ style={{ marginLeft: 48 }}
+ columns={[
+ {
+ title: "库ä½å称",
+ dataIndex: "storePositionName",
+ key: "storePositionName",
+ search: false,
+ },
+ {
+ title: "批次å·/SNå·",
+ dataIndex: "materieControlNo",
+ key: "materieControlNo",
+ search: false,
+ },
+ {
+ title: "ä¾›åº”å•†ç¼–å· - å称",
+ dataIndex: "supplierNo",
+ key: "supplierNo",
+ search: false,
+ render: (dom, row) => {
+ return (row.supplierNo ?? '') + " - " + (row.supplierName ?? '')
+ }
+ },
+ {
+ title: "下架数é‡",
+ dataIndex: "outstroeNum",
+ key: "outstroeNum",
+ search: false,
+ }
+ ,
+ {
+ title: "备注",
+ dataIndex: "remark",
+ key: "remark",
+ search: false,
+ }
+ ,
+ {
+ title: "æ“作人",
+ dataIndex: "uploadUserName",
+ key: "uploadUserName",
+ search: false,
+ }
+ ,
+ {
+ title: "æ“作时间",
+ dataIndex: "uploadTime",
+ key: "uploadTime",
+ search: false,
+ }
+ ]}
+ dataSource={record.downloadList}
+ pagination={false}
+ />,
+ },
+ pagination: "false"
+ },
+ ],
+ },
]
},
- dooutside = (fid) => ({
+ dooutside = (fid, storeId) => ({
totalCard: [
//物料详情
{
@@ -788,7 +902,7 @@ const one = {
},
],
expandable: {
- expandedRowRender: record => <EditUpload record={record} fid={fid} />,
+ expandedRowRender: record => <EditUpload record={record} fid={fid} storeId={storeId} />,
}
},
],
diff --git a/src/pages/outsetstore/Outstore/index.jsx b/src/pages/outsetstore/Outstore/index.jsx
index 0aad5bf0336c48e41be7c365597dde995813ab3a..c68c50b033a3a879025ccc4bf5e8f3efb0f94eae 100644
--- a/src/pages/outsetstore/Outstore/index.jsx
+++ b/src/pages/outsetstore/Outstore/index.jsx
@@ -10,6 +10,7 @@ import defaultFields from "./fields";
import { doFetch } from "@/utils/doFetch";
import DrawInitForm from "@/components/DrawInitForm";
import getPrem from '@/utils/getPrem';//æƒé™åˆ¤æ–fn
+import { useReactToPrint } from 'react-to-print';
const keytoval = {
@@ -67,7 +68,8 @@ function Instore(props) {
width:1200
}),
actionRef = useRef(),
- ChildRef = null;
+ ChildRef = null,
+ printRef = useRef();
//æ“作完æˆåŽåˆ·æ–°
function reload() {
@@ -80,6 +82,11 @@ function Instore(props) {
}))
}
+ const handlePrint = useReactToPrint({
+ content: () => printRef.current,
+ });
+
+
const columns = useMemo(() => {
if (activeTabKey == "1") {
return [
@@ -98,7 +105,15 @@ function Instore(props) {
title: `查看详情`,
...defaultFields?.detail,
totalPath: "/ngic-workmanship/wmsMaterieOutstore/getOutStoreInfoById",
- totalParams: { id: record.id }
+ totalParams: { id: record.id },
+ printRef: printRef,
+ extra: (<Button
+ onClick={async () => {
+ handlePrint()
+ }}
+ >
+ 打å°
+ </Button>)
}))
}}
>{dom}</a>
@@ -198,7 +213,7 @@ function Instore(props) {
return [
getPrem("equipmentCustomer_save", action, '下架采集', async () => {
- let extra = defaultFields.dooutside(record.id);
+ let extra = defaultFields.dooutside(record.id,record.storeId);
setdrawprops(s => ({
...s,
visible: true,