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
2c27fcec
Commit
2c27fcec
authored
Jul 22, 2024
by
15008242619
Committed by
jingnan
Jul 24, 2024
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
产品质量记录整改说明 申请节点设置后续所有参与者
parent
48cabd0d
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
151 additions
and
26 deletions
+151
-26
index.vue
...-mes/src/privateComponents/components/ZGSMApply/index.vue
+74
-12
index.vue
.../src/privateComponents/components/setAssessment/index.vue
+1
-1
index.vue
...views/workflow/task-center/myPlanTask/ZGSMApply/index.vue
+76
-13
No files found.
applications/dee-mes/src/privateComponents/components/ZGSMApply/index.vue
View file @
2c27fcec
...
...
@@ -68,6 +68,16 @@ export default {
multiple
:
true
,
options
:
[]
}
},
{
title
:
'设置检验员'
,
key
:
'testerIds'
,
component
:
{
clearable
:
true
,
name
:
'el-select'
,
placeholder
:
'请选择'
,
multiple
:
true
,
options
:
[]
}
}]
}],
rules
:
{
...
...
@@ -77,6 +87,13 @@ export default {
message
:
'请填写负责人'
,
trigger
:
[
'blur'
,
'change'
]
}
],
testerIds
:
[
{
required
:
true
,
message
:
'请填写检验员'
,
trigger
:
[
'blur'
,
'change'
]
}
]
}
}
...
...
@@ -134,22 +151,65 @@ export default {
if
(
item
.
key
===
'userIds'
)
{
item
.
component
.
options
=
arr
}
/**
item.key === 'userIds' && (item.component.options = arr.map(row => {
return {
value: row.value,
label: row.label
})
}).
catch
((
err
)
=>
{
console
.
log
(
err
)
})
const
httpParams1
=
{
'pageFrom'
:
1
,
'pageSize'
:
9999
,
'searchItems'
:
{
'children'
:
[],
'items'
:
[
{
'fieldName'
:
'source.name'
,
'operator'
:
'IN'
,
'value'
:
[
'检验技术员'
]
}
],
'operator'
:
'AND'
},
'openProps'
:
[
{
'name'
:
'source'
,
'pageFrom'
:
1
,
'pageSize'
:
9999
},
{
'name'
:
'target'
,
'pageFrom'
:
1
,
'pageSize'
:
9999
}
],
'sortItem'
:
[
{
'fieldName'
:
'modifyTime'
,
'sortOrder'
:
'desc'
}
]
}
post
(
'/DxGroupMemberLink/search'
,
httpParams1
).
then
(
res
=>
{
const
arr
=
[]
const
ids
=
[]
res
.
items
.
content
.
forEach
(
item
=>
{
if
(
ids
.
indexOf
(
item
.
target
.
id
)
===
-
1
)
{
ids
.
push
(
item
.
target
.
id
)
arr
.
push
({
value
:
item
.
target
.
id
,
label
:
item
.
target
.
name
+
'/'
+
item
.
target
.
number
})
}
})
this
.
formData
[
0
].
data
.
forEach
(
item
=>
{
if
(
item
.
key
===
'testerIds'
)
{
item
.
component
.
options
=
arr
}
))
*/
})
}).
catch
((
err
)
=>
{
console
.
log
(
err
)
})
},
tableToolHandler
(
e
)
{
console
.
log
(
e
.
key
.
btnValue
)
if
(
e
.
key
.
btnValue
===
'ZGSMApply'
)
{
this
.
ZGSMApply
()
}
...
...
@@ -170,26 +230,28 @@ export default {
if
(
this
.
selectionRows
&&
this
.
selectionRows
.
length
)
{
this
.
selectionRows
.
forEach
(
item
=>
ids
.
push
(
item
.
id
))
}
if
(
this
.
form
.
userIds
&&
this
.
form
.
userIds
.
length
!==
0
)
{
post
(
'/QualityRecord/creator/apply?userIds='
+
this
.
form
.
userIds
,
ids
).
then
(
res
=>
{
if
(
this
.
form
.
userIds
&&
this
.
form
.
userIds
.
length
!==
0
&&
this
.
form
.
testerIds
&&
this
.
form
.
testerIds
.
length
!==
0
)
{
post
(
'/QualityRecord/creator/apply?userIds='
+
this
.
form
.
userIds
+
'&testerIds='
+
this
.
form
.
testerIds
,
ids
).
then
(
res
=>
{
this
.
$utils
.
showMessageSuccess
(
'提交成功'
)
setTimeout
(()
=>
{
this
.
$refs
.
applyTable
.
$refs
.
asCom
.
getData
()
},
1500
)
}).
catch
(
err
=>
{
}).
catch
(
()
=>
{
this
.
$utils
.
showMessageWarning
(
'出现异常,提交失败'
)
}).
finally
(()
=>
{
this
.
dialogVisible
=
false
this
.
setPersonVisible
=
false
this
.
$set
(
this
.
form
,
'userIds'
,
''
)
this
.
$set
(
this
.
form
,
'testerIds'
,
''
)
})
}
else
{
this
.
$utils
.
showMessageWarning
(
'请
选择审批负责人
'
)
this
.
$utils
.
showMessageWarning
(
'请
填写相关人员
'
)
}
},
setPersonCancle
()
{
this
.
setPersonVisible
=
false
this
.
$set
(
this
.
form
,
'userIds'
,
''
)
this
.
$set
(
this
.
form
,
'testerIds'
,
''
)
},
selectionChange
(
val
)
{
this
.
selectionRows
=
val
...
...
applications/dee-mes/src/privateComponents/components/setAssessment/index.vue
View file @
2c27fcec
...
...
@@ -34,7 +34,7 @@ export default {
}
const
data
=
this
.
$utils
.
findByNameVnode
(
this
,
'DeeAsCom'
)
post
(
'/QualityRecord/saveAssessment?id='
+
data
.
basicData
.
id
,
this
.
input
).
then
(()
=>
{
this
.
$utils
.
showMessageSuccess
(
'保存成功'
)
this
.
$utils
.
showMessageSuccess
(
'
填写内容
保存成功'
)
this
.
history
=
this
.
input
}).
catch
(()
=>
{
this
.
$utils
.
showMessageWarning
(
'出现异常,保存失败'
)
...
...
applications/dee-task-center/src/views/workflow/task-center/myPlanTask/ZGSMApply/index.vue
View file @
2c27fcec
...
...
@@ -40,8 +40,9 @@
import
{
post
}
from
'@/utils/http'
export
default
{
name
:
'ZGSMApply'
,
components
:
{},
name
:
'ZGSMList'
,
componentName
:
'整改说明'
,
components
:
{
},
props
:
{
selectData
:
{
type
:
Object
,
...
...
@@ -67,6 +68,16 @@ export default {
multiple
:
true
,
options
:
[]
}
},
{
title
:
'设置检验员'
,
key
:
'testerIds'
,
component
:
{
clearable
:
true
,
name
:
'el-select'
,
placeholder
:
'请选择'
,
multiple
:
true
,
options
:
[]
}
}]
}],
rules
:
{
...
...
@@ -76,6 +87,13 @@ export default {
message
:
'请填写负责人'
,
trigger
:
[
'blur'
,
'change'
]
}
],
testerIds
:
[
{
required
:
true
,
message
:
'请填写检验员'
,
trigger
:
[
'blur'
,
'change'
]
}
]
}
}
...
...
@@ -133,22 +151,65 @@ export default {
if
(
item
.
key
===
'userIds'
)
{
item
.
component
.
options
=
arr
}
/**
item.key === 'userIds' && (item.component.options = arr.map(row => {
return {
value: row.value,
label: row.label
})
}).
catch
((
err
)
=>
{
console
.
log
(
err
)
})
const
httpParams1
=
{
'pageFrom'
:
1
,
'pageSize'
:
9999
,
'searchItems'
:
{
'children'
:
[],
'items'
:
[
{
'fieldName'
:
'source.name'
,
'operator'
:
'IN'
,
'value'
:
[
'检验技术员'
]
}
],
'operator'
:
'AND'
},
'openProps'
:
[
{
'name'
:
'source'
,
'pageFrom'
:
1
,
'pageSize'
:
9999
},
{
'name'
:
'target'
,
'pageFrom'
:
1
,
'pageSize'
:
9999
}
],
'sortItem'
:
[
{
'fieldName'
:
'modifyTime'
,
'sortOrder'
:
'desc'
}
]
}
post
(
'/DxGroupMemberLink/search'
,
httpParams1
).
then
(
res
=>
{
const
arr
=
[]
const
ids
=
[]
res
.
items
.
content
.
forEach
(
item
=>
{
if
(
ids
.
indexOf
(
item
.
target
.
id
)
===
-
1
)
{
ids
.
push
(
item
.
target
.
id
)
arr
.
push
({
value
:
item
.
target
.
id
,
label
:
item
.
target
.
name
+
'/'
+
item
.
target
.
number
})
}
})
this
.
formData
[
0
].
data
.
forEach
(
item
=>
{
if
(
item
.
key
===
'testerIds'
)
{
item
.
component
.
options
=
arr
}
))
*/
})
}).
catch
((
err
)
=>
{
console
.
log
(
err
)
})
},
tableToolHandler
(
e
)
{
console
.
log
(
e
.
key
.
btnValue
)
if
(
e
.
key
.
btnValue
===
'ZGSMApply'
)
{
this
.
ZGSMApply
()
}
...
...
@@ -169,8 +230,8 @@ export default {
if
(
this
.
selectionRows
&&
this
.
selectionRows
.
length
)
{
this
.
selectionRows
.
forEach
(
item
=>
ids
.
push
(
item
.
id
))
}
if
(
this
.
form
.
userIds
&&
this
.
form
.
userIds
.
length
!==
0
)
{
post
(
'/QualityRecord/creator/apply?userIds='
+
this
.
form
.
userIds
,
ids
).
then
(
res
=>
{
if
(
this
.
form
.
userIds
&&
this
.
form
.
userIds
.
length
!==
0
&&
this
.
form
.
testerIds
&&
this
.
form
.
testerIds
.
length
!==
0
)
{
post
(
'/QualityRecord/creator/apply?userIds='
+
this
.
form
.
userIds
+
'&testerIds='
+
this
.
form
.
testerIds
,
ids
).
then
(
res
=>
{
this
.
$utils
.
showMessageSuccess
(
'提交成功'
)
setTimeout
(()
=>
{
this
.
$refs
.
applyTable
.
$refs
.
asCom
.
getData
()
...
...
@@ -181,14 +242,16 @@ export default {
this
.
dialogVisible
=
false
this
.
setPersonVisible
=
false
this
.
$set
(
this
.
form
,
'userIds'
,
''
)
this
.
$set
(
this
.
form
,
'testerIds'
,
''
)
})
}
else
{
this
.
$utils
.
showMessageWarning
(
'请
选择审批负责人
'
)
this
.
$utils
.
showMessageWarning
(
'请
填写相关人员
'
)
}
},
setPersonCancle
()
{
this
.
setPersonVisible
=
false
this
.
$set
(
this
.
form
,
'userIds'
,
''
)
this
.
$set
(
this
.
form
,
'testerIds'
,
''
)
},
selectionChange
(
val
)
{
this
.
selectionRows
=
val
...
...
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