Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
T
TF-MOM-WEB
Project
Project
Details
Activity
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
TFMOM
TF-MOM-WEB
Commits
d2d2a2cf
Commit
d2d2a2cf
authored
Sep 28, 2023
by
旭艳
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev' of
http://94.191.100.41/tfmom/tf-mom-web
into dev
parents
2515dc46
a18764f3
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
14 additions
and
8 deletions
+14
-8
dee_ui.js
applications/architecture-dee/public/dee-ui/dee_ui.js
+4
-4
report.html
applications/architecture-dee/public/dee-ui/report.html
+2
-2
胶漆.png
applications/architecture-dee/public/icons/menu/胶漆.png
+0
-0
index.vue
...ts/components/AddPutStorageMaterialDetailDialog/index.vue
+6
-0
index.vue
...mponents/components/OutStorageCallBackReqAmount/index.vue
+1
-1
index.vue
.../workflow/task-center/myPlanTask/warehouseApply/index.vue
+1
-1
No files found.
applications/architecture-dee/public/dee-ui/dee_ui.js
View file @
d2d2a2cf
This diff is collapsed.
Click to expand it.
applications/architecture-dee/public/dee-ui/report.html
View file @
d2d2a2cf
This source diff could not be displayed because it is too large. You can
view the blob
instead.
applications/architecture-dee/public/icons/menu/胶漆.png
0 → 100644
View file @
d2d2a2cf
345 Bytes
applications/dee-mes/src/privateComponents/components/AddPutStorageMaterialDetailDialog/index.vue
View file @
d2d2a2cf
...
...
@@ -146,6 +146,12 @@ export default {
align-content
:
center
;
margin-top
:
10px
;
}
.search-box-col
{
width
:
300px
!
important
;
}
.w60
{
width
:
30px
!
important
;
}
}
</
style
>
applications/dee-mes/src/privateComponents/components/OutStorageCallBackReqAmount/index.vue
View file @
d2d2a2cf
...
...
@@ -38,7 +38,7 @@ export default {
if
(
this
.
form
.
inventory
&&
this
.
form
.
inventory
.
usableAmount
)
{
return
this
.
form
.
inventory
.
usableAmount
}
else
{
return
1
return
99999
}
}
},
...
...
applications/dee-task-center/src/views/workflow/task-center/myPlanTask/warehouseApply/index.vue
View file @
d2d2a2cf
...
...
@@ -115,7 +115,7 @@ export default {
<
style
lang=
'scss'
>
.warehouseApply
{
width
:
100%
;
height
:
100%
;
height
:
calc
(
100%
-
50px
)
;
box-sizing
:
border-box
;
padding
:
0
4px
;
.search-form-box-com
.search-box-col
{
...
...
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