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
fa34f1fe
Commit
fa34f1fe
authored
Oct 26, 2023
by
“lixuyan”
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
调整胶漆页面细节
parent
21006e58
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
58 additions
and
28 deletions
+58
-28
index.vue
.../src/privateComponents/components/LacquerFreeze/index.vue
+37
-21
index.vue
...ivateComponents/components/MutualAttachmentList/index.vue
+1
-0
header.vue
...s/src/views/taskExecution/components/LacClaims/header.vue
+20
-7
No files found.
applications/dee-mes/src/privateComponents/components/LacquerFreeze/index.vue
View file @
fa34f1fe
...
@@ -117,27 +117,6 @@ export default {
...
@@ -117,27 +117,6 @@ export default {
cardId
:
null
,
cardId
:
null
,
// 左侧行编号
// 左侧行编号
newCardNo
:
null
,
newCardNo
:
null
,
tools
:
[{
name
:
'分装'
,
icon
:
'/icons/c-add.png'
,
handler
:
{
click
:
(
e
)
=>
{
this
.
$refs
.
dialog
.
open
()
}
}
},
{
name
:
'打印'
,
icon
:
'/icons/c-print.png'
,
handler
:
{
click
:
(
e
)
=>
{
if
(
this
.
sectionData
.
length
!==
1
)
{
this
.
$message
.
error
(
'请选择一条数据'
)
}
else
{
this
.
print
()
}
}
}
}],
colums2
:
[
colums2
:
[
{
{
title
:
'操作'
,
title
:
'操作'
,
...
@@ -241,6 +220,43 @@ export default {
...
@@ -241,6 +220,43 @@ export default {
}
}
}
}
},
},
computed
:
{
tools
()
{
if
(
this
.
basicData
.
appState
===
'deployed'
)
{
return
[{
name
:
'分装'
,
icon
:
'/icons/c-add.png'
,
handler
:
{
click
:
(
e
)
=>
{
this
.
$refs
.
dialog
.
open
()
}
}
},
{
name
:
'打印'
,
icon
:
'/icons/c-print.png'
,
handler
:
{
click
:
(
e
)
=>
{
if
(
this
.
sectionData
.
length
!==
1
)
{
this
.
$message
.
error
(
'请选择一条数据'
)
}
else
{
this
.
print
()
}
}
}
}]
}
else
{
return
[{
name
:
'分装'
,
icon
:
'/icons/c-add.png'
,
handler
:
{
click
:
(
e
)
=>
{
this
.
$refs
.
dialog
.
open
()
}
}
}]
}
}
},
watch
:
{
watch
:
{
form
:
{
form
:
{
immediate
:
true
,
immediate
:
true
,
...
...
applications/dee-mes/src/privateComponents/components/MutualAttachmentList/index.vue
View file @
fa34f1fe
...
@@ -102,6 +102,7 @@ export default {
...
@@ -102,6 +102,7 @@ export default {
)
)
.
then
((
res
)
=>
{
.
then
((
res
)
=>
{
this
.
$utils
.
showMessage
(
'操作成功!'
,
'success'
)
this
.
$utils
.
showMessage
(
'操作成功!'
,
'success'
)
this
.
$bus
.
$emit
(
'opertorSuccess'
)
})
})
.
catch
((
err
)
=>
console
.
log
(
err
))
.
catch
((
err
)
=>
console
.
log
(
err
))
.
finally
(()
=>
{
.
finally
(()
=>
{
...
...
applications/dee-mes/src/views/taskExecution/components/LacClaims/header.vue
View file @
fa34f1fe
...
@@ -96,12 +96,22 @@
...
@@ -96,12 +96,22 @@
<i
class=
"el-icon-edit-outline"
/>
<i
class=
"el-icon-edit-outline"
/>
</
template
>
</
template
>
<
template
slot-scope=
"scope"
>
<
template
slot-scope=
"scope"
>
<el-
input
<el-
date-picker
v-if=
"scope.row.needTimeSelect"
v-if=
"scope.row.needTimeSelect"
v-model=
"scope.row.needTime"
v-model=
"scope.row.needTime"
clearable
type=
"date"
placeholder=
"选择日期"
value-format=
"yyyy-MM-dd HH:mm:ss"
@
focus=
"tableInputFocus"
@
focus=
"tableInputFocus"
@
blur
=
"deeTableBlur(scope.row, false)"
@
change
=
"deeTableBlur(scope.row, false)"
/>
/>
<!--
<el-input
v-if=
"scope.row.needTimeSelect"
v-model=
"scope.row.needTime"
@
focus=
"tableInputFocus"
@
blur=
"deeTableBlur(scope.row, false)"
/>
-->
<span
v-else
>
{{
scope
.
row
[
scope
.
column
.
property
]
}}
</span>
<span
v-else
>
{{
scope
.
row
[
scope
.
column
.
property
]
}}
</span>
<i
<i
v-if=
"scope.row.needTimeLoading"
v-if=
"scope.row.needTimeLoading"
...
@@ -139,6 +149,7 @@
...
@@ -139,6 +149,7 @@
</template>
</template>
<
script
>
<
script
>
let
timer
=
null
import
{
post
}
from
'@/utils/http'
import
{
post
}
from
'@/utils/http'
export
default
{
export
default
{
components
:
{},
components
:
{},
...
@@ -270,8 +281,11 @@ export default {
...
@@ -270,8 +281,11 @@ export default {
return
label
return
label
},
},
rowClick
(
row
)
{
rowClick
(
row
)
{
clearTimeout
(
timer
)
timer
=
setTimeout
(()
=>
{
this
.
rowData
=
row
this
.
rowData
=
row
this
.
$parent
.
$parent
.
$parent
.
$refs
.
footer
.
getTableData
(
this
.
rowData
.
id
)
this
.
$parent
.
$parent
.
$parent
.
$refs
.
footer
.
getTableData
(
this
.
rowData
.
id
)
},
300
)
},
},
/**
/**
* 胶漆使用申请
* 胶漆使用申请
...
@@ -333,8 +347,6 @@ export default {
...
@@ -333,8 +347,6 @@ export default {
var
that
=
this
var
that
=
this
const
param
=
{
const
param
=
{
id
:
row
.
id
,
id
:
row
.
id
,
dxClassname
:
'com.tf.mes.vo.storage.StorageRequestItemVo'
,
subTypeName
:
'StorageRequestItemMatch'
,
operator
:
'MODIFY'
,
operator
:
'MODIFY'
,
needTime
:
row
.
needTime
needTime
:
row
.
needTime
}
}
...
@@ -344,7 +356,7 @@ export default {
...
@@ -344,7 +356,7 @@ export default {
row
.
needTimeLoading
=
false
row
.
needTimeLoading
=
false
return
return
}
}
post
(
'/
StorageRequest
Item/recursion'
,
param
)
post
(
'/
ExtSupporting
Item/recursion'
,
param
)
.
then
((
res
)
=>
{
.
then
((
res
)
=>
{
if
(
res
.
message
.
includes
(
'成功'
))
{
if
(
res
.
message
.
includes
(
'成功'
))
{
that
.
$message
({
that
.
$message
({
...
@@ -370,6 +382,7 @@ export default {
...
@@ -370,6 +382,7 @@ export default {
this
.
timer
=
null
this
.
timer
=
null
},
},
deeTableEdit
(
row
,
column
,
cell
,
event
)
{
deeTableEdit
(
row
,
column
,
cell
,
event
)
{
clearTimeout
(
timer
)
var
that
=
this
var
that
=
this
if
(
column
.
property
===
'needTime'
)
{
if
(
column
.
property
===
'needTime'
)
{
row
.
needTimeSelect
=
true
row
.
needTimeSelect
=
true
...
...
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