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
881e8f0d
Commit
881e8f0d
authored
Feb 02, 2023
by
TZW
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug
parent
0aa09e4a
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
41 additions
and
2 deletions
+41
-2
index.jsx
src/pages/device/account/index.jsx
+22
-1
columns.js
src/pages/maintain/criterion/columns.js
+6
-0
index.jsx
src/pages/maintain/workOrder/index.jsx
+13
-1
No files found.
src/pages/device/account/index.jsx
View file @
881e8f0d
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
* @Author: Li Hanlin
* @Author: Li Hanlin
* @Date: 2022-11-10 09:39:56
* @Date: 2022-11-10 09:39:56
* @Last Modified by: Li Hanlin
* @Last Modified by: Li Hanlin
* @Last Modified time: 2023-02-0
1 15:40:07
* @Last Modified time: 2023-02-0
2 10:16:20
*/
*/
import
*
as
React
from
'react'
;
import
*
as
React
from
'react'
;
...
@@ -28,10 +28,15 @@ import TreeRender from '@/components/TreeRender';
...
@@ -28,10 +28,15 @@ import TreeRender from '@/components/TreeRender';
import
{
ProDescriptions
}
from
'@ant-design/pro-components'
;
import
{
ProDescriptions
}
from
'@ant-design/pro-components'
;
import
InitForm
from
'@/components/InitForm'
;
import
InitForm
from
'@/components/InitForm'
;
import
ExtendField
from
'@/components/ExtendField'
;
import
ExtendField
from
'@/components/ExtendField'
;
import
dayjs
from
'dayjs'
;
const
{
Sider
,
Content
}
=
Layout
;
const
{
Sider
,
Content
}
=
Layout
;
function
Model
(
props
)
{
function
Model
(
props
)
{
const
disabledDateOfDay
=
(
current
)
=>
{
// Can not select days before today and today
return
current
&&
current
>
dayjs
().
endOf
(
'day'
);
};
const
actionRef
=
useRef
(),
const
actionRef
=
useRef
(),
formRef
=
useRef
(),
formRef
=
useRef
(),
[
drawer
,
setDrawer
]
=
useState
({
[
drawer
,
setDrawer
]
=
useState
({
...
@@ -59,6 +64,7 @@ function Model(props) {
...
@@ -59,6 +64,7 @@ function Model(props) {
dataIndex
:
'reformDate'
,
dataIndex
:
'reformDate'
,
key
:
'reformDate'
,
key
:
'reformDate'
,
valueType
:
'date'
,
valueType
:
'date'
,
formItemProps
:
{
rules
:
[{
required
:
true
,
message
:
'此项为必填项'
}]
},
formItemProps
:
{
rules
:
[{
required
:
true
,
message
:
'此项为必填项'
}]
},
},
},
{
{
...
@@ -1542,6 +1548,9 @@ function Model(props) {
...
@@ -1542,6 +1548,9 @@ function Model(props) {
dataIndex
:
'reformDate'
,
dataIndex
:
'reformDate'
,
key
:
'reformDate'
,
key
:
'reformDate'
,
valueType
:
'date'
,
valueType
:
'date'
,
fieldProps
:
{
disabledDate
:
disabledDateOfDay
,
},
formItemProps
:
{
rules
:
[{
required
:
true
,
message
:
'此项为必填项'
}]
},
formItemProps
:
{
rules
:
[{
required
:
true
,
message
:
'此项为必填项'
}]
},
},
},
{
{
...
@@ -1593,6 +1602,9 @@ function Model(props) {
...
@@ -1593,6 +1602,9 @@ function Model(props) {
title
:
'报废日期'
,
title
:
'报废日期'
,
dataIndex
:
'scrapDate'
,
dataIndex
:
'scrapDate'
,
key
:
'scrapDate'
,
key
:
'scrapDate'
,
fieldProps
:
{
disabledDate
:
disabledDateOfDay
,
},
valueType
:
'date'
,
valueType
:
'date'
,
formItemProps
:
{
rules
:
[{
required
:
true
,
message
:
'此项为必填项'
}]
},
formItemProps
:
{
rules
:
[{
required
:
true
,
message
:
'此项为必填项'
}]
},
},
},
...
@@ -1698,6 +1710,9 @@ function Model(props) {
...
@@ -1698,6 +1710,9 @@ function Model(props) {
dataIndex
:
'transferDate'
,
dataIndex
:
'transferDate'
,
key
:
'transferDate'
,
key
:
'transferDate'
,
valueType
:
'date'
,
valueType
:
'date'
,
fieldProps
:
{
disabledDate
:
disabledDateOfDay
,
},
formItemProps
:
{
rules
:
[{
required
:
true
,
message
:
'此项为必填项'
}]
},
formItemProps
:
{
rules
:
[{
required
:
true
,
message
:
'此项为必填项'
}]
},
},
},
{
{
...
@@ -1784,6 +1799,9 @@ function Model(props) {
...
@@ -1784,6 +1799,9 @@ function Model(props) {
title
:
'借用日期'
,
title
:
'借用日期'
,
dataIndex
:
'borrowDate'
,
dataIndex
:
'borrowDate'
,
key
:
'borrowDate'
,
key
:
'borrowDate'
,
fieldProps
:
{
disabledDate
:
disabledDateOfDay
,
},
valueType
:
'date'
,
valueType
:
'date'
,
formItemProps
:
{
rules
:
[{
required
:
true
,
message
:
'此项为必填项'
}]
},
formItemProps
:
{
rules
:
[{
required
:
true
,
message
:
'此项为必填项'
}]
},
},
},
...
@@ -1879,6 +1897,9 @@ function Model(props) {
...
@@ -1879,6 +1897,9 @@ function Model(props) {
dataIndex
:
'realReturnDate'
,
dataIndex
:
'realReturnDate'
,
key
:
'realReturnDate'
,
key
:
'realReturnDate'
,
valueType
:
'date'
,
valueType
:
'date'
,
fieldProps
:
{
disabledDate
:
disabledDateOfDay
,
},
formItemProps
:
{
rules
:
[{
required
:
true
,
message
:
'此项为必填项'
}]
},
formItemProps
:
{
rules
:
[{
required
:
true
,
message
:
'此项为必填项'
}]
},
},
},
{
{
...
...
src/pages/maintain/criterion/columns.js
View file @
881e8f0d
...
@@ -20,6 +20,9 @@ function getcolumns(equipmentModelId) {
...
@@ -20,6 +20,9 @@ function getcolumns(equipmentModelId) {
],
],
},
},
valueType
:
'select'
,
valueType
:
'select'
,
fieldProps
:
{
showSearch
:
true
,
},
mode
:
'radio'
,
mode
:
'radio'
,
options
:
[
options
:
[
{
{
...
@@ -37,6 +40,9 @@ function getcolumns(equipmentModelId) {
...
@@ -37,6 +40,9 @@ function getcolumns(equipmentModelId) {
dataIndex
:
'equipmentModelName'
,
dataIndex
:
'equipmentModelName'
,
key
:
'equipmentModelId'
,
key
:
'equipmentModelId'
,
valueType
:
'select'
,
valueType
:
'select'
,
fieldProps
:
{
showSearch
:
true
,
},
formItemProps
:
{
formItemProps
:
{
rules
:
[
rules
:
[
{
{
...
...
src/pages/maintain/workOrder/index.jsx
View file @
881e8f0d
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
* @Author: Li Hanlin
* @Author: Li Hanlin
* @Date: 2023-01-19 09:53:59
* @Date: 2023-01-19 09:53:59
* @Last Modified by: Li Hanlin
* @Last Modified by: Li Hanlin
* @Last Modified time: 2023-02-0
1 16:14:59
* @Last Modified time: 2023-02-0
2 11:00:36
*/
*/
import
*
as
React
from
'react'
;
import
*
as
React
from
'react'
;
...
@@ -90,6 +90,13 @@ function WorkOrder(props) {
...
@@ -90,6 +90,13 @@ function WorkOrder(props) {
dataIndex
:
'qualitativeJudgeResult'
,
dataIndex
:
'qualitativeJudgeResult'
,
key
:
'qualitativeJudgeResult'
,
key
:
'qualitativeJudgeResult'
,
hideInForm
:
true
,
hideInForm
:
true
,
render
:
(
_
,
row
)
=>
{
if
(
row
?.
judgeType
==
1
)
{
return
row
?.
judgeResultName
;
}
else
{
return
row
?.
qualitativeJudgeResult
;
}
},
},
},
{
{
title
:
'下限值'
,
title
:
'下限值'
,
...
@@ -342,6 +349,7 @@ function WorkOrder(props) {
...
@@ -342,6 +349,7 @@ function WorkOrder(props) {
const
order
=
(
text
,
row
,
_
,
action
)
=>
{
const
order
=
(
text
,
row
,
_
,
action
)
=>
{
return
(
return
(
<
PremButton
<
PremButton
access=
"umMaintainTask_orderReceiving"
pop=
{
{
pop=
{
{
title
:
'是否接单?'
,
title
:
'是否接单?'
,
okText
:
'确认'
,
okText
:
'确认'
,
...
@@ -364,6 +372,7 @@ function WorkOrder(props) {
...
@@ -364,6 +372,7 @@ function WorkOrder(props) {
const
close
=
(
text
,
row
,
_
,
action
)
=>
{
const
close
=
(
text
,
row
,
_
,
action
)
=>
{
return
(
return
(
<
PremButton
<
PremButton
access=
"umMaintainTask:customsDeclaration"
pop=
{
{
pop=
{
{
title
:
'是否关单?'
,
title
:
'是否关单?'
,
okText
:
'确认'
,
okText
:
'确认'
,
...
@@ -387,6 +396,7 @@ function WorkOrder(props) {
...
@@ -387,6 +396,7 @@ function WorkOrder(props) {
const
finish
=
(
text
,
row
,
_
,
action
)
=>
{
const
finish
=
(
text
,
row
,
_
,
action
)
=>
{
return
(
return
(
<
PremButton
<
PremButton
access=
"umMaintainTask:finishMaintainTask"
btn=
{
{
btn=
{
{
size
:
'small'
,
size
:
'small'
,
onClick
:
()
=>
{
onClick
:
()
=>
{
...
@@ -419,6 +429,7 @@ function WorkOrder(props) {
...
@@ -419,6 +429,7 @@ function WorkOrder(props) {
const
remove
=
(
text
,
row
,
_
,
action
)
=>
{
const
remove
=
(
text
,
row
,
_
,
action
)
=>
{
return
(
return
(
<
PremButton
<
PremButton
access=
"umMaintainTask:deleteById"
pop=
{
{
pop=
{
{
title
:
'是否删除?'
,
title
:
'是否删除?'
,
okText
:
'确认'
,
okText
:
'确认'
,
...
@@ -440,6 +451,7 @@ function WorkOrder(props) {
...
@@ -440,6 +451,7 @@ function WorkOrder(props) {
const
verify
=
(
text
,
row
,
_
,
action
)
=>
{
const
verify
=
(
text
,
row
,
_
,
action
)
=>
{
return
(
return
(
<
PremButton
<
PremButton
access=
"umMaintainTask:verification"
btn=
{
{
btn=
{
{
size
:
'small'
,
size
:
'small'
,
onClick
:
()
=>
{
onClick
:
()
=>
{
...
...
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