Skip to content

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

asder

parent 0103c46e
Expand all Show whitespace changes
Inline Side-by-side
Showing with 107 additions and 700 deletions
config/proxy.js
View file @ ec35a8d1
...@@ -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.114:18040/", //39:18040 23/wms/ //60 翔 //18 target: "http://192.168.40.114:28040/", //39:18040 23/wms/ //60 翔 //18
changeOrigin: true, changeOrigin: true,
pathRewrite: { pathRewrite: {
"^/wms": "", "^/wms": "",
......
package.json
View file @ ec35a8d1
...@@ -61,6 +61,7 @@ ...@@ -61,6 +61,7 @@
"lodash": "^4.17.0", "lodash": "^4.17.0",
"moment": "^2.29.1", "moment": "^2.29.1",
"omit.js": "^2.0.2", "omit.js": "^2.0.2",
"print-js": "^1.6.0",
"rc-menu": "^9.1.0", "rc-menu": "^9.1.0",
"rc-util": "^5.16.0", "rc-util": "^5.16.0",
"react": "^17.0.0", "react": "^17.0.0",
......
src/components/EditTable/index.jsx
View file @ ec35a8d1
...@@ -11,11 +11,13 @@ const EditTable = ({ ...@@ -11,11 +11,13 @@ const EditTable = ({
rowKey, rowKey,
recordCreatorProps, recordCreatorProps,
maxLength, maxLength,
linkconfig linkconfig,
style
}) => { }) => {
const editorFormRef = useRef() const editorFormRef = useRef()
return ( return (
<EditableProTable <EditableProTable
style={{ ...(style ?? {}) }}
columns={columns} columns={columns}
rowKey={rowKey} rowKey={rowKey}
value={value || []} value={value || []}
...@@ -84,7 +86,6 @@ const EditTable = ({ ...@@ -84,7 +86,6 @@ const EditTable = ({
} else { } else {
let res = await database(parames); let res = await database(parames);
console.log(newvalue);
newvalue = newvalue.map((it, i) => { newvalue = newvalue.map((it, i) => {
if (it[rowKey] == record[rowKey]) { if (it[rowKey] == record[rowKey]) {
Object.keys(effectresult).map(items => { Object.keys(effectresult).map(items => {
......
src/pages/historystore/Histore/fields.js deleted 100644 → 0
View file @ 0103c46e
This diff is collapsed.
src/pages/historystore/Histore/index.jsx
View file @ ec35a8d1
...@@ -6,10 +6,6 @@ import { ...@@ -6,10 +6,6 @@ import {
message, message,
} from "antd"; } from "antd";
import AutoTable from "@/components/AutoTable"; import AutoTable from "@/components/AutoTable";
import defaultFields from "./fields";
import { doFetch } from "@/utils/doFetch";
import DrawInitForm from "@/components/DrawInitForm";
import getPrem from '@/utils/getPrem';//权限判断fn
function Instore(props) { function Instore(props) {
const actionRef = useRef(), const actionRef = useRef(),
......
src/pages/insertstore/Instore/fields.js
View file @ ec35a8d1
...@@ -23,7 +23,7 @@ const EditUpload = ({ record, fid }) => { ...@@ -23,7 +23,7 @@ const EditUpload = ({ record, fid }) => {
id, id,
uploadList: value[id]?.map(its => { uploadList: value[id]?.map(its => {
return { return {
storeId: its?.storeId, storePositionId: its?.storePositionId,
instroeNum: its?.instroeNum, instroeNum: its?.instroeNum,
remark: its?.remark remark: its?.remark
} }
...@@ -41,11 +41,11 @@ const EditUpload = ({ record, fid }) => { ...@@ -41,11 +41,11 @@ const EditUpload = ({ record, fid }) => {
{ {
title: "库位名称", title: "库位名称",
dataIndex: "storeName", dataIndex: "storeName",
key: "storeId", key: "storePositionId",
search: false, search: false,
valueType: "select", valueType: "select",
request: async () => { request: async () => {
let res = await doFetch({ url: "/ngic-auth/sysStore/selectionBox", params: { factoryIdList: [] } }); let res = await doFetch({ url: "/ngic-auth/sysStorePosition/queryByStoreId/selection", params: { storeId: record.storeId } });
return res?.data?.dataList return res?.data?.dataList
}, },
editable: (text, record, index) => { editable: (text, record, index) => {
...@@ -750,6 +750,19 @@ const one = { ...@@ -750,6 +750,19 @@ const one = {
}, },
], ],
}, },
{
cardTitle: "强制关闭信息",
itemData: [
{
title: "操作人",
key: "closeUserName",
},
{
title: "操作时间",
key: "closeTime",
}
],
},
] ]
}, doinsert = (fid) => ({ }, doinsert = (fid) => ({
totalCard: [ totalCard: [
......
src/pages/insertstore/Instore/index.jsx
View file @ ec35a8d1
...@@ -98,7 +98,11 @@ function Instore(props) { ...@@ -98,7 +98,11 @@ function Instore(props) {
title: `查看详情`, title: `查看详情`,
...defaultFields?.detail, ...defaultFields?.detail,
totalPath: "/ngic-workmanship/wmsMaterieInstore/getInStoreInfoById", totalPath: "/ngic-workmanship/wmsMaterieInstore/getInStoreInfoById",
totalParams: { id: record.id } totalParams: { id: record.id },
extra: (<Button>
打印
</Button>)
})) }))
}} }}
>{dom}</a> >{dom}</a>
......
src/pages/outsetstore/Outstore/fields.js
View file @ ec35a8d1
import { factorySelect, shopSelectByFactory } from "@/services/system"; import { factorySelect, shopSelectByFactory } from "@/services/system";
import { doFetch } from "@/utils/doFetch"; import { doFetch } from "@/utils/doFetch";
import { Button, Table } from "antd"; import { Button, Table } from "antd";
import { EditableProTable } from "@ant-design/pro-table"; import EditTable from "@/components/EditTable";
import { useEffect, useState } from 'react' import { useEffect, useState } from 'react'
import { useModel } from 'umi' import { useModel } from 'umi'
...@@ -21,12 +21,12 @@ const EditUpload = ({ record, fid }) => { ...@@ -21,12 +21,12 @@ const EditUpload = ({ record, fid }) => {
let id = it; let id = it;
return { return {
id, id,
uploadList: value[id]?.map(its => { downloadList: value[id]?.map(its => {
return { return {
storeId: its?.storeId, storePositionId: its?.storePositionId,
outstroeNum: its?.outstroeNum, outstroeNum: its?.outstroeNum,
remark: its?.remark, remark: its?.remark,
materieControlNo:its?.materieControlNo materieControlNo: its?.materieControlNo
} }
}) })
} }
...@@ -35,18 +35,28 @@ const EditUpload = ({ record, fid }) => { ...@@ -35,18 +35,28 @@ const EditUpload = ({ record, fid }) => {
})) }))
}, [value]) }, [value])
return <EditableProTable return <EditTable
maxLength={1000} maxLength={1000}
linkconfig={{
urlchangeval: {
database: (params) => doFetch({ url: "/ngic-workmanship/wmsMaterieStore/queryStoreOne", params }),
params: { "materieId": "linked" },
effectresult: {
"productionUnit": "productionUnit",
"productionUnitName": "productionUnitName"
}
}
}}
style={{ marginLeft: 48 }} style={{ marginLeft: 48 }}
columns={[ columns={[
{ {
title: "库位名称", title: "库位名称",
dataIndex: "storeName", dataIndex: "storeName",
key: "storeId", key: "storePositionId",
search: false, search: false,
valueType: "select", valueType: "select",
request: async () => { request: async () => {
let res = await doFetch({ url: "/ngic-auth/sysStore/selectionBox", params: { factoryIdList: [] } }); let res = await doFetch({ url: "/ngic-auth/sysStorePosition/queryByStoreId/selection", params: { storeId: record.storeId } });
return res?.data?.dataList return res?.data?.dataList
}, },
editable: (text, record, index) => { editable: (text, record, index) => {
...@@ -71,6 +81,20 @@ const EditUpload = ({ record, fid }) => { ...@@ -71,6 +81,20 @@ const EditUpload = ({ record, fid }) => {
return !record.materieOutstoreDetailId return !record.materieOutstoreDetailId
} }
}, },
{
title: "供应商编号-名称",
dataIndex: "supplierNo",
key: "supplierNo",
search: false,
"readonly": true,
},
{
title: "库存数量",
dataIndex: "productionNum",
key: "productionNum",
search: false,
"readonly": true,
},
{ {
title: "备注", title: "备注",
dataIndex: "remark", dataIndex: "remark",
...@@ -92,23 +116,11 @@ const EditUpload = ({ record, fid }) => { ...@@ -92,23 +116,11 @@ const EditUpload = ({ record, fid }) => {
} }
]} ]}
value={[...(record.downloadList ?? []), ...(value[record.id] ?? [])]} value={[...(record.downloadList ?? []), ...(value[record.id] ?? [])]}
recordCreatorProps={{ onChange={(vals) => {
newRecordType: "dataSource",
record: () => ({
id: Date.now(),
}),
}}
editable={{
type: "multiple",
actionRender: (row, config, defaultDoms) => {
return [defaultDoms.delete];
},
onValuesChange: async (records, recordList) => {
setvalue(s => ({ setvalue(s => ({
...s, ...s,
[record.id]: recordList [record.id]: vals
})); }));
},
}} }}
pagination={false} pagination={false}
/> />
...@@ -674,14 +686,30 @@ const one = { ...@@ -674,14 +686,30 @@ const one = {
key: "storeName", key: "storeName",
search: false, 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: "下架数量", title: "下架数量",
dataIndex: "outstroeNum", dataIndex: "outstroeNum",
key: "outstroeNum", key: "outstroeNum",
search: false, search: false,
} }
]} ]}
dataSource={record.uploadList} dataSource={record.downloadList}
pagination={false} pagination={false}
/>, />,
} }
......
src/pages/platform/Sendset/Formpage.jsx
View file @ ec35a8d1
...@@ -7,7 +7,7 @@ import InitForm from '@/components/InitForm'; ...@@ -7,7 +7,7 @@ import InitForm from '@/components/InitForm';
import { doFetch } from '@/utils/doFetch'; import { doFetch } from '@/utils/doFetch';
import { tableField } from "./fields"; import { tableField } from "./fields";
import moment from "moment"; import moment from "moment";
import { factory, allDepartment, allShop, allSection, roleList, currentUserList } from "@/services/system"; import { factory, allDepartment, allShop, depart, selectionBoxAll,roleList, currentUserList } from "@/services/system";
const { TextArea } = Input, const { TextArea } = Input,
{ Paragraph } = Typography; { Paragraph } = Typography;
...@@ -515,13 +515,10 @@ const Formpage = (props) => { ...@@ -515,13 +515,10 @@ const Formpage = (props) => {
database = factory database = factory
break; break;
case 3: case 3:
database = allDepartment database = depart
break; break;
case 4: case 4:
database = allShop database = selectionBoxAll
break;
case 5:
database = allSection
break; break;
} }
......
src/pages/platform/Sendset/fields.js
View file @ ec35a8d1
...@@ -48,15 +48,15 @@ const addFields = { ...@@ -48,15 +48,15 @@ const addFields = {
"value": 1 "value": 1
}, },
{ {
"label": "组织", "label": "工厂",
"value": 2 "value": 2
}, },
{ {
"label": "仓库", "label": "组织",
"value": 3 "value": 3
}, },
{ {
"label": "工厂", "label": "仓库",
"value": 4 "value": 4
} }
] ]
......
src/pages/platform/Sendset/index.jsx
View file @ ec35a8d1
...@@ -233,15 +233,15 @@ const Pushdeploy = (props) => { ...@@ -233,15 +233,15 @@ const Pushdeploy = (props) => {
"value": 1 "value": 1
}, },
{ {
"label": "组织", "label": "工厂",
"value": 2 "value": 2
}, },
{ {
"label": "仓库", "label": "组织",
"value": 3 "value": 3
}, },
{ {
"label": "工厂", "label": "仓库",
"value": 4 "value": 4
} }
] ]
......
src/services/system.js
View file @ ec35a8d1
...@@ -189,6 +189,25 @@ export async function factory(params) { ...@@ -189,6 +189,25 @@ export async function factory(params) {
data: params, data: params,
}); });
} }
//
// 4 ：
//集团下拉框
export async function depart(params) {
return request(`/wms/ngic-auth/sysDepartment/query/selectbox/depart`, {
method: 'POST',
data: params,
});
}
//集团下拉框
export async function selectionBoxAll(params) {
return request(`/wms/ngic-auth/sysStore/selectionBoxAll`, {
method: 'POST',
data: params,
});
}
//下拉框---当前公司下 //下拉框---当前公司下
export async function currentUserList(params) { export async function currentUserList(params) {
return request(`/wms/ngic-auth/sysUser/query/selectbox/current/company`, { return request(`/wms/ngic-auth/sysUser/query/selectbox/current/company`, {
......
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