Skip to content

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

重置表格设置

parent 9de05491
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 775 additions and 60 deletions
config/routes.js
View file @ 2fadafaa
...@@ -217,9 +217,14 @@ export default [ ...@@ -217,9 +217,14 @@ export default [
component: './platform/Custom', component: './platform/Custom',
}, },
{ {
path: '/store/reservoir', path: '/store/location',
name: '库区库位', name: '库位管理',
component: './platform/Reservoir', component: './system/Reservoir',
},
{
path: '/store/area',
name: '库区管理',
component: './system/Area',
}, },
{ {
component: "./404", component: "./404",
......
src/components/AutoTable/mtable copy.jsx
View file @ 2fadafaa
...@@ -350,37 +350,75 @@ class Mtable extends PureComponent { ...@@ -350,37 +350,75 @@ class Mtable extends PureComponent {
columnsState={{ columnsState={{
value: this.state.valueColumns, value: this.state.valueColumns,
onChange: (val, state) => { onChange: (val, state) => {
let submitdata = { if (Object.keys(val).length === 0) {
...this.state.valueColumns, console.log(val, valueColumns);
...val, let submitdata = {
}; ...s,
this.setState( ...this.state.valueColumns,
{ };
valueColumns: submitdata,
}, let controList = Object.keys(submitdata).map((it, i) => {
(state) => { return {
if (!this.props.path) return; fieldKey: it,
doFetch({ fieldWidth: submitdata[it].width,
url: "/ngic-base-business/paFieldScene/save", fieldOrder: i,
params: { fieldFixed: submitdata[it].fixed,
sceneMark: extraparams fieldShow: true,
? path + bodyParse(extraparams) };
: activeTabKey });
? path + activeTabKey
: path, this.setState(
controList: Object.keys(submitdata).map((it) => { {
return { valueColumns: controList,
fieldKey: it, },
fieldWidth: submitdata[it].width, (s) => {
fieldOrder: submitdata[it].order, if (!this.props.path) return;
fieldFixed: submitdata[it].fixed, doFetch({
fieldShow: submitdata[it].show, url: "/ngic-base-business/paFieldScene/save",
}; params: {
}), sceneMark: extraparams
}, ? path + bodyParse(extraparams)
}); : activeTabKey
} ? path + activeTabKey
); : path,
controList: controList,
},
});
}
);
} else {
let submitdata = {
...this.state.valueColumns,
...val,
};
this.setState(
{
valueColumns: submitdata,
},
(state) => {
if (!this.props.path) return;
doFetch({
url: "/ngic-base-business/paFieldScene/save",
params: {
sceneMark: extraparams
? path + bodyParse(extraparams)
: activeTabKey
? path + activeTabKey
: path,
controList: Object.keys(submitdata).map((it) => {
return {
fieldKey: it,
fieldWidth: submitdata[it].width,
fieldOrder: submitdata[it].order,
fieldFixed: submitdata[it].fixed,
fieldShow: submitdata[it].show,
};
}),
},
});
}
);
}
}, },
}} }}
scroll={{ scroll={{
......
src/components/AutoTable/mtable.jsx
View file @ 2fadafaa
...@@ -263,32 +263,65 @@ const Mtable = (props) => { ...@@ -263,32 +263,65 @@ const Mtable = (props) => {
columnsState={{ columnsState={{
value: valueColumns, value: valueColumns,
onChange: (val, state) => { onChange: (val, state) => {
setvalueColumns((s) => { console.log(val);
let submitdata = { if (Object.keys(val).length === 0) {
...s, console.log(val, valueColumns);
...val, setvalueColumns((s) => {
}; let submitdata = {
doFetch({ ...s,
url: "/ngic-base-business/paFieldScene/save", ...valueColumns,
params: { };
sceneMark: extraparams
? path + bodyParse(extraparams) let controList = Object.keys(submitdata).map((it, i) => {
: activeTabKey return {
? path + activeTabKey fieldKey: it,
: path, fieldWidth: submitdata[it].width,
controList: Object.keys(submitdata).map((it) => { fieldOrder: i,
return { fieldFixed: submitdata[it].fixed,
fieldKey: it, fieldShow: true,
fieldWidth: submitdata[it].width, };
fieldOrder: submitdata[it].order, });
fieldFixed: submitdata[it].fixed, doFetch({
fieldShow: submitdata[it].show, url: "/ngic-base-business/paFieldScene/save",
}; params: {
}), sceneMark: extraparams
}, ? path + bodyParse(extraparams)
: activeTabKey
? path + activeTabKey
: path,
controList: controList,
},
});
return controList;
}); });
return submitdata; } else {
}); setvalueColumns((s) => {
let submitdata = {
...s,
...val,
};
doFetch({
url: "/ngic-base-business/paFieldScene/save",
params: {
sceneMark: extraparams
? path + bodyParse(extraparams)
: activeTabKey
? path + activeTabKey
: path,
controList: Object.keys(submitdata).map((it) => {
return {
fieldKey: it,
fieldWidth: submitdata[it].width,
fieldOrder: submitdata[it].order,
fieldFixed: submitdata[it].fixed,
fieldShow: submitdata[it].show,
};
}),
},
});
return submitdata;
});
}
}, },
}} }}
pagination={ pagination={
......
src/pages/system/Area/fields.js 0 → 100644
View file @ 2fadafaa
import { factorySelect } from "@/services/system";
import { doFetch } from "@/utils/doFetch";
export default {
"storeCode": {
"value": null,
"type": "input",
"title": "仓库编号",
"name": [
"storeCode"
],
"required": false
},
"storeName": {
"value": null,
"type": "input",
"title": "仓库名称",
"name": [
"storeName"
],
"required": true
},
"storeType": {
"value": null,
"type": "select",
"title": "仓库类型",
"name": [
"storeType"
],
"required": true,
"options": {
database:()=>doFetch({url:"/ngic-base-business/sysDic/queryStoreTypeSelect",params:{}}),
params:{}
}
},
"factoryId": {
"value": null,
"type": "select",
"title": "所属工厂",
"name": ["factoryId"],
"required": true,
"options": {
"database": factorySelect,
"params": {},
},
}
};
src/pages/system/Area/fieldstore.js 0 → 100644
View file @ 2fadafaa
import { doFetch } from "@/utils/doFetch";
export default {
"storePositionName": {
"value": null,
"type": "input",
"title": "库位名称",
"name": [
"storePositionName"
],
"required": true
},
"storeAreaCode": {
"value": null,
"type": "select",
"title": "所属库区",
"name": [
"storeAreaCode"
],
"required": true,
"options": {
"database":()=> doFetch({url:"/ngic-base-business/sysDic/queryStorePositionSelect"}),
"params": {}
}
},
"description": {
"value": null,
"type": "textarea",
"title": "描述",
"name": [
"description"
],
"required": false,
col:{span:24}
}
};
src/pages/system/Area/index.jsx 0 → 100644
View file @ 2fadafaa
import React, { useEffect, useRef, useReducer } from "react";
import { Button, Tooltip, Row, Divider, Drawer } from "antd";
import AutoTable from "@/components/AutoTable";
import getPrem from "@/utils/getPrem"; //权限判断fn
import { useRequest } from "umi";
import defaultFields from "./fields";
import { doFetch } from "@/utils/doFetch";
import DrawInitForm from "@/components/DrawInitForm";
import StoreApp from './store'
const initState = {
vs: false,
fields: {},
iftype: {},
curitem: {},
detail: {
dataSource: {},
totalCard: [],
},
visible: false,
},
otherBasic = {
productionLineName: "产线（加工中心）",
sectionName: "工段",
processLineName: "工艺路线",
groupName: "班组",
shiftName: "班次",
};
function reducer(state, action) {
let { type } = action,
newState = {};
switch (type) {
case "add":
newState = {
...state,
vs: true,
iftype: {
title: "新增仓库",
val: type,
},
fields: { ...action.fields },
};
break;
case "edit":
newState = {
...state,
vs: true,
iftype: {
title: "编辑仓库",
val: type,
},
fields: { ...action.fields },
curitem: action.curitem,
};
break;
case "see":
newState = {
...state,
curitem: action.curitem,
visible: true,
};
break;
case "close":
newState = {
...state,
curitem: {},
vs: false,
visible: false,
};
break;
}
return newState;
}
const Store = (props) => {
let actionRef = useRef(),
ChildRef = null;
function reload() {
actionRef?.current?.reload();
ChildRef?.onRefresh();
}
const { run, loading } = useRequest(doFetch, {
manual: true,
formatResult: (res) => res,
onSuccess: (result, params) => {
if (result.code == "0000") {
reload();
dispatch({ type: "close" });
}
},
}),
[state, dispatch] = useReducer(reducer, initState),
{ vs, fields, iftype, curitem, detail, visible } = state,
columns = [
{
"title": "仓库编号",
"dataIndex": "storeCode",
"key": "storeCode"
},
{
"title": "仓库名称",
"dataIndex": "storeName",
"key": "storeName"
},
{
"title": "仓库类型",
"dataIndex": "storeTypeName",
"key": "storeType",
"valueType": "select",
"options": {
database: () => doFetch({ url: "/ngic-base-business/sysDic/queryStoreTypeSelect", params: {} }),
params: {}
}
},
{
"title": "工厂名",
"dataIndex": "factoryName",
"key": "factoryName"
},
{
title: "操作",
dataIndex: "option_dataindex",
key: "option_dataindex",
valueType: "option",
width: 135,
render: (text, row, _, action) => extraAction(text, row, _, action),
},
];
function extraAction(text, record, _, action) {
return [
getPrem("sysDepartment_save", action, "库位管理", () => {
dispatch({ type: "see", curitem: record });
}),
getPrem("sysDepartment_save", action, "修改", () => {
for (let i in defaultFields) {
defaultFields[i].value = record[i];
}
dispatch({ type: "edit", fields: defaultFields, curitem: record });
}),
getPrem("sysDepartment_deleteById", action, "删除", null, {
title: "确认删除该仓库？",
onConfirm: () => {
run({
url: "/ngic-auth/sysStore/deleteById",
params: { id: record.id },
});
},
}),
];
}
let saveData = (values, fn) => {
let newfields = JSON.parse(JSON.stringify(values));
//新增&修改
let difrid = iftype.val == "edit" ? { id: curitem.id } : {};
run({
url: "/ngic-auth/sysStore/save",
params: { ...newfields, ...difrid },
});
};
let extrarender = [
<Button
disabled={!getPrem("sysDepartment_save", "ifs")}
type="primary"
onClick={() => {
for (let i in defaultFields) {
defaultFields[i].value = null;
defaultFields[i].disabled = false;
}
dispatch({ type: "add", fields: defaultFields });
}}
>
新增
</Button>,
];
return (
<div>
<AutoTable
pagetitle={props.route.name} //页面标题
pageextra={extrarender} //页面操作 新增or批量删除
columns={columns}
path="/ngic-auth/sysStore/queryList"
actionRef={actionRef}
onRef={(node) => (ChildRef = node)}
></AutoTable>
<DrawInitForm
title={iftype.title}
visible={vs}
onClose={() => dispatch({ type: "close" })}
footer={false}
destroyOnClose={true}
fields={fields}
submitData={(values) => {
saveData(values);
}}
onChange={(changedValues, allValues) => {
//联动操作
}}
submitting={loading || !vs}
width={"60%"}
>
</DrawInitForm>
<Drawer
visible={visible}
onClose={() => dispatch({ type: "close" })}
title="库位列表"
footer={false}
destroyOnClose={true}
width={"100%"}
getContainer={false}
style={{ position: "absolute" }}
>
<StoreApp curitem={curitem}></StoreApp>
</Drawer>
</div>
);
};
export default Store;
src/pages/system/Area/store.js 0 → 100644
View file @ 2fadafaa
This diff is collapsed.
src/utils/detailTotalCard.js
View file @ 2fadafaa
...@@ -253,7 +253,7 @@ const userDetails = [ ...@@ -253,7 +253,7 @@ const userDetails = [
}, },
{ {
title: "备注", title: "备注",
key: "remarks", key: "remark",
col: { span: 24 }, col: { span: 24 },
}, },
], ],
......
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