Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
E
ems3.3
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wuhao
ems3.3
Commits
3e004033
Commit
3e004033
authored
Jan 30, 2023
by
wuhao
🎯
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
asder
parent
387701f5
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
16 additions
and
7 deletions
+16
-7
proxy.js
config/proxy.js
+1
-1
index.jsx
src/components/InitForm/Diyrule/index.jsx
+5
-5
index.jsx
src/components/InitForm/index.jsx
+10
-1
No files found.
config/proxy.js
View file @
3e004033
...
...
@@ -13,7 +13,7 @@ export default {
dev
:
{
[
defaultSetting
.
proxypath
]:
{
// 要代理的地址
target
:
'http://192.168.40.
64:2
8000'
,
//jf哥
target
:
'http://192.168.40.
203:
8000'
,
//jf哥
// target: 'http://192.168.40.64:28000', //gc哥
// target: 'http://192.168.40.203:8000', //dj哥
changeOrigin
:
true
,
...
...
src/components/InitForm/Diyrule/index.jsx
View file @
3e004033
...
...
@@ -262,7 +262,7 @@ let Diyrule = (props) => {
other
:
other
,
});
}
}
></
Input
>
/
>
</
div
>
</
Col
>
);
...
...
@@ -321,7 +321,7 @@ let Diyrule = (props) => {
other
:
other
,
});
}
}
></
Input
>
/
>
</
div
>
</
Col
>
);
...
...
@@ -434,7 +434,7 @@ let Diyrule = (props) => {
</
a
>
</
Col
>
<
Col
span=
{
24
}
>
{
renderDom
(
it
,
'last'
)
}
</
Col
>
<
Divider
></
Divider
>
<
Divider
/
>
</
Row
>
);
})
}
...
...
@@ -510,7 +510,7 @@ let Diyrule = (props) => {
},
});
}
}
></
InputNumber
>
/
>
</
Col
>
<
Col
span=
{
4
}
>
...
...
@@ -531,7 +531,7 @@ let Diyrule = (props) => {
},
});
}
}
></
Select
>
/
>
</
Col
>
</
Row
>
</
div
>
...
...
src/components/InitForm/index.jsx
View file @
3e004033
...
...
@@ -153,9 +153,18 @@ function InitForm(props) {
}),
}
:
{};
let
result
=
res
?.
data
?.
data
;
if
(
result
?.
nrList
)
{
result
.
nrList
=
result
?.
nrList
?.
map
((
it
)
=>
{
it
.
sort
=
it
.
sort
-
1
;
return
it
;
});
}
return
{
...
defaultFormValue
,
...(
res
?.
data
?.
data
??
{}),
...(
res
ult
??
{}),
...
relationSupplierList
,
};
}
else
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment