Commit 835fb822 authored by wuhao's avatar wuhao 🎯

asder

parent d6e35f85
...@@ -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.18:18040/", //39:18040 23/wms/ //60 翔 target: "http://192.168.40.212:18040/", //39:18040 23/wms/ //60 翔
changeOrigin: true, changeOrigin: true,
pathRewrite: { pathRewrite: {
"^/wms": "", "^/wms": "",
......
...@@ -322,4 +322,7 @@ table { ...@@ -322,4 +322,7 @@ table {
} }
.ant-pro-table-list-toolbar{ .ant-pro-table-list-toolbar{
overflow: hidden !important; overflow: hidden !important;
}
.ant-select-selector{
overflow: hidden !important;
} }
\ No newline at end of file
...@@ -7,6 +7,7 @@ import { ...@@ -7,6 +7,7 @@ import {
departmentTree, departmentTree,
roleSelect, roleSelect,
} from "@/services/system"; } from "@/services/system";
import { doFetch } from "@/utils/doFetch";
export default { export default {
accountName: { accountName: {
value: null, value: null,
...@@ -53,7 +54,7 @@ export default { ...@@ -53,7 +54,7 @@ export default {
linked: true, linked: true,
multiple: true, multiple: true,
}, },
storeIdList: { storeIdList: {
value: null, value: null,
type: "select", type: "select",
...@@ -62,12 +63,12 @@ export default { ...@@ -62,12 +63,12 @@ export default {
required: false, required: false,
belinked: { belinked: {
options: { options: {
database: storeselectionBox, database: (params) => doFetch({ url: "/ngic-auth/sysStore/selectionBox", params: { ...params } }),
params: { params: {
}, factoryIdList: "linked"
}
}, },
}, },
linked: true,
multiple: true, multiple: true,
}, },
roleIdList: { roleIdList: {
......
...@@ -284,6 +284,12 @@ const Login = () => { ...@@ -284,6 +284,12 @@ const Login = () => {
</Button> </Button>
} }
}} }}
onValuesChange={async (values) => {
if (Object.keys(values)[0] == "factoryIdList") {
formRef.current.setFieldsValue({ storeIdList: [] });
}
}}
title={<span style={{ color: "#fff" }}>WMS</span>} title={<span style={{ color: "#fff" }}>WMS</span>}
subTitle={ subTitle={
<span style={{ color: "rgba(255,255,255,0.6)" }}> <span style={{ color: "rgba(255,255,255,0.6)" }}>
...@@ -453,38 +459,21 @@ const Login = () => { ...@@ -453,38 +459,21 @@ const Login = () => {
]} ]}
/> />
</Col> </Col>
<Col span={8}> <Col span={8}>
<ProFormSelect <ProFormDependency name={["factoryIdList"]}>
fieldProps={{
mode: "multiple",
maxTagCount: 1
}}
name="storeIdList"
label={<b>负责仓库</b>}
placeholder={"请选择负责仓库"}
request={async () => {
let res = await storeselectionBoxAll({});
return res?.data?.dataList ?? []
}}
rules={[
{
required: false,
message: "请选择负责仓库!",
}
]}
/>
{/* <ProFormDependency name={["factoryId"]}>
{ {
({ factoryId }) => { ({ factoryIdList }) => {
return <ProFormSelect return <ProFormSelect
fieldProps={{
mode: "multiple",
maxTagCount: 1,
}}
name="storeIdList" name="storeIdList"
label={<b>负责仓库</b>} label={<b>负责仓库</b>}
placeholder={"请选择负责仓库"} placeholder={"请选择负责仓库"}
params={{ factoryId }} params={{ factoryIdList }}
request={async (params) => { request={async (params) => {
let res = await storeselectionBoxAll({}); let res = await storeselectionBoxAll(params);
return res?.data?.dataList ?? [] return res?.data?.dataList ?? []
}} }}
rules={[ rules={[
...@@ -498,8 +487,7 @@ const Login = () => { ...@@ -498,8 +487,7 @@ const Login = () => {
} }
</ProFormDependency> */} </ProFormDependency>
</Col> </Col>
<Col span={8}> <Col span={8}>
......
...@@ -31,7 +31,7 @@ export async function shopSelect(params) { ...@@ -31,7 +31,7 @@ export async function shopSelect(params) {
} }
//仓库下拉 //仓库下拉
export async function storeselectionBoxAll(params) { export async function storeselectionBoxAll(params) {
return request(`/wms/ngic-auth/sysStore/selectionBoxAll`, { return request(`/wms/ngic-auth/sysStore/selectionBox`, {
method: "POST", method: "POST",
data: params, data: params,
}); });
......
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