Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
6
608-pdm-web-5g
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
pdm
608-pdm-web-5g
Commits
4b2ed69a
Commit
4b2ed69a
authored
May 22, 2024
by
xioln
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
问题修改
parent
81d7711e
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
208 additions
and
35 deletions
+208
-35
form.vue
src/components/form/form.vue
+5
-19
vanReadable.vue
src/components/form/vanReadable.vue
+10
-4
tabs.js
src/store/modules/tabs.js
+1
-1
index.vue
src/views/InfoDetail/index.vue
+45
-6
choosePerson.vue
...askDetails/components/taskBtn/components/choosePerson.vue
+127
-0
index.vue
...nts/workFlowTask/taskDetails/components/taskBtn/index.vue
+20
-4
todoListLazyCell.vue
src/views/todoList/components/todoListLazyCell.vue
+0
-1
No files found.
src/components/form/form.vue
View file @
4b2ed69a
...
@@ -59,6 +59,7 @@
...
@@ -59,6 +59,7 @@
</template>
</template>
<slot
name=
"button"
></slot>
<slot
name=
"button"
></slot>
</van-form>
</van-form>
<van-popup
round
v-model=
"popupShow"
:style=
"{ height: '50%',width: '80%',padding: '20px'}"
>
{{popupShowText}}
</van-popup>
</div>
</div>
</template>
</template>
<
script
>
<
script
>
...
@@ -83,7 +84,10 @@ export default {
...
@@ -83,7 +84,10 @@ export default {
components
:
{},
components
:
{},
// 数据源 给组件分发数据用
// 数据源 给组件分发数据用
data
()
{
data
()
{
return
{}
return
{
popupShow
:
false
,
popupShowText
:
''
}
},
},
computed
:
{
computed
:
{
formValue
()
{
formValue
()
{
...
@@ -200,24 +204,6 @@ export default {
...
@@ -200,24 +204,6 @@ export default {
</
script
>
</
script
>
<
style
lang=
"scss"
>
<
style
lang=
"scss"
>
.form
{
.form
{
// .sub-title {
// font-weight: bold;
// color: #212121;
// padding: 10px 0 10px 5px;
// display: flex;
// flex-direction: row;
// box-sizing: border-box;
// border-bottom: 1px solid #ebedf0;
// &:before {
// content: '';
// width: 4px;
// height: 13px;
// background: #096aff;
// border-radius: 2px;
// align-self: center;
// margin-right: 7px
// }
// }
.sub-title
{
.sub-title
{
text-align
:
left
;
text-align
:
left
;
border
:
none
;
border
:
none
;
...
...
src/components/form/vanReadable.vue
View file @
4b2ed69a
<
template
>
<
template
>
<div
class=
"
input
"
>
<div
class=
"
van-Readable
"
>
<van-field
<van-field
v-if=
"itemObj"
v-if=
"itemObj"
v-model=
"inputValue"
v-model=
"inputValue"
...
@@ -8,8 +8,11 @@
...
@@ -8,8 +8,11 @@
:readonly=
"itemObj.name === 'readable' ? true : false"
:readonly=
"itemObj.name === 'readable' ? true : false"
:name=
"name"
:name=
"name"
:label=
"label"
:label=
"label"
:type=
"itemObj.type"
:type=
"itemObj.type
||'textarea'
"
:formatter=
"item.formatter"
:formatter=
"item.formatter"
rows=
"1"
autosize
max-row=
"0"
>
>
<div
v-if=
"itemObj.verifyIcon"
slot=
"button"
>
<div
v-if=
"itemObj.verifyIcon"
slot=
"button"
>
<img
:src=
"itemObj.verifyIcon"
@
click=
"getVerifyCode"
/>
<img
:src=
"itemObj.verifyIcon"
@
click=
"getVerifyCode"
/>
...
@@ -94,11 +97,10 @@ export default {
...
@@ -94,11 +97,10 @@ export default {
}
}
</
script
>
</
script
>
<
style
lang=
"scss"
scoped
>
<
style
lang=
"scss"
scoped
>
.
input
{
.
van-Readable
{
::v-deep
.van-field__label
{
::v-deep
.van-field__label
{
width
:
auto
;
width
:
auto
;
}
}
img
{
img
{
width
:
70px
;
width
:
70px
;
height
:
30px
;
height
:
30px
;
...
@@ -107,5 +109,9 @@ export default {
...
@@ -107,5 +109,9 @@ export default {
right
:
0%
;
right
:
0%
;
transform
:
translate
(
-0%
,
-50%
);
transform
:
translate
(
-0%
,
-50%
);
}
}
::v-deep
.van-field__control
{
display
:
flex
!
important
;
}
}
}
</
style
>
</
style
>
src/store/modules/tabs.js
View file @
4b2ed69a
...
@@ -7,7 +7,7 @@ const state = {
...
@@ -7,7 +7,7 @@ const state = {
{
key
:
'DeeFlowDxDocumentAttrsEdit'
,
title
:
'是否归档'
},
{
key
:
'DeeFlowDxDocumentAttrsEdit'
,
title
:
'是否归档'
},
{
key
:
'DeeFlowSecretConfirm'
,
title
:
'密级确认'
},
{
key
:
'DeeFlowSecretConfirm'
,
title
:
'密级确认'
},
{
key
:
'DeeFlowDxDocumentEditReplyComments'
,
title
:
'答复意见'
},
{
key
:
'DeeFlowDxDocumentEditReplyComments'
,
title
:
'答复意见'
},
{
key
:
'DeeFlowExtSendOrderEditFeedBack'
,
title
:
'答复意见'
},
//
{ key: 'DeeFlowExtSendOrderEditFeedBack', title: '答复意见' },
{
key
:
'DeeFlowDxDocumentAttrsEditWhetherApplied'
,
title
:
'封面贴皮'
},
{
key
:
'DeeFlowDxDocumentAttrsEditWhetherApplied'
,
title
:
'封面贴皮'
},
{
key
:
'taskHistory'
,
title
:
'签审历史'
}
{
key
:
'taskHistory'
,
title
:
'签审历史'
}
...
...
src/views/InfoDetail/index.vue
View file @
4b2ed69a
...
@@ -47,11 +47,16 @@ export default {
...
@@ -47,11 +47,16 @@ export default {
},
},
async
mounted
()
{
async
mounted
()
{
console
.
log
(
'this.$route.query.type'
,
this
.
$route
.
query
.
type
)
if
(
this
.
$route
.
query
.
type
===
'ISTART'
)
{
if
(
this
.
$route
.
query
.
type
===
'ISTART'
)
{
this
.
tabs
=
[{
title
:
'基本信息'
,
key
:
'baseInfo'
}]
this
.
tabs
=
[{
title
:
'基本信息'
,
key
:
'baseInfo'
}]
this
.
activeTab
=
'baseInfo'
this
.
activeTab
=
'baseInfo'
await
this
.
getIstartFormData
()
await
this
.
getIstartFormData
()
console
.
log
(
'222'
,
JSON
.
parse
(
localStorage
.
getItem
(
'taskInfo'
)))
}
else
if
([
'ExtActionItem'
,
'ExtActionInfo'
].
includes
(
this
.
$route
.
query
.
dxClassname
))
{
this
.
tabs
=
[{
title
:
'基本信息'
,
key
:
'baseInfo'
}]
this
.
activeTab
=
'baseInfo'
await
this
.
getFormData
()
await
this
.
getForm
()
}
else
{
}
else
{
await
this
.
getFormData
()
await
this
.
getFormData
()
await
this
.
getForm
()
await
this
.
getForm
()
...
@@ -153,9 +158,43 @@ export default {
...
@@ -153,9 +158,43 @@ export default {
})
})
},
},
fiiterData
(
formData
)
{
fiiterData
(
formData
)
{
console
.
log
(
'formData'
,
formData
)
formData
.
forEach
(
item
=>
{
formData
.
forEach
(
item
=>
{
if
(
item
.
title
&&
item
.
title
!==
'关联文档'
)
{
console
.
log
(
'item.title'
,
item
.
title
)
// eslint-disable-next-line no-unused-vars
if
(
item
.
title
&&
item
.
title
!==
'关联文档'
&&
item
.
title
!==
'附件'
)
{
// eslint-disable-next-line no-unused-vars
const
that
=
this
const
fd
=
{
title
:
item
.
title
,
split
:
1
,
data
:
item
.
data
.
map
(
d
=>
{
let
show
=
false
if
(
d
.
component
?.
obscure
)
{
// eslint-disable-next-line no-eval
show
=
eval
(
d
.
component
?.
obscure
.
replace
(
/this/g
,
'that'
))
}
return
{
title
:
d
.
title
,
key
:
d
.
key
,
disabled
:
d
.
disabled
,
formatter
:
function
(
row
)
{
if
(
row
&&
[
'true'
,
'false'
].
includes
(
row
))
{
return
row
===
'true'
?
'是'
:
'否'
}
else
{
return
row
}
},
component
:
{
name
:
d
?.
component
?.
name
,
// options: d.component.options,
dictTypeCode
:
d
?.
fildProp
?.
type
===
'DictDataVO'
?
d
?.
fildProp
?.
rule
?.
dictTypeCode
:
''
,
show
:
show
}
}
})
}
this
.
formData
.
push
(
fd
)
}
else
if
(
item
.
title
!==
'附件'
)
{
const
that
=
this
const
that
=
this
const
fd
=
{
const
fd
=
{
title
:
item
.
title
,
title
:
item
.
title
,
...
@@ -163,7 +202,7 @@ export default {
...
@@ -163,7 +202,7 @@ export default {
data
:
item
.
data
.
map
(
d
=>
{
data
:
item
.
data
.
map
(
d
=>
{
let
show
=
false
let
show
=
false
if
(
d
.
component
?.
obscure
)
{
if
(
d
.
component
?.
obscure
)
{
// eslint-disable-next-line no-eval
// eslint-disable-next-line no-eval
show
=
eval
(
d
.
component
?.
obscure
.
replace
(
/this/g
,
'that'
))
show
=
eval
(
d
.
component
?.
obscure
.
replace
(
/this/g
,
'that'
))
}
}
return
{
return
{
...
@@ -178,9 +217,9 @@ export default {
...
@@ -178,9 +217,9 @@ export default {
}
}
},
},
component
:
{
component
:
{
name
:
d
.
component
.
name
,
name
:
d
?.
component
?
.
name
,
// options: d.component.options,
// options: d.component.options,
dictTypeCode
:
d
.
fildProp
.
type
===
'DictDataVO'
?
d
.
fildProp
.
rule
.
dictTypeCode
:
''
,
dictTypeCode
:
d
?.
fildProp
?.
type
===
'DictDataVO'
?
d
?.
fildProp
?.
rule
?
.
dictTypeCode
:
''
,
show
:
show
show
:
show
}
}
}
}
...
...
src/views/busniessComponents/workFlowTask/taskDetails/components/taskBtn/components/choosePerson.vue
0 → 100644
View file @
4b2ed69a
<
template
>
<div
class=
"choose-person"
>
<van-dialog
v-model=
"show"
title=
"委派"
show-cancel-button
confirm-button-color=
"#5282f0"
:before-close=
"beforeClose"
>
<div
class=
"dialog-box"
>
<van-search
v-model=
"search_value"
placeholder=
"请输入关键字进行搜索"
/>
<div
class=
"select-box"
>
<van-radio-group
v-if=
"selectList.length > 0"
v-model=
"value"
>
<van-radio
checked-color=
"#5282f0"
v-for=
"item in selectList"
:name=
"item.id"
:key=
"item.id"
@
click=
"SelectEvent(item)"
>
{{
item
.
label
}}
</van-radio>
</van-radio-group>
</div>
</div>
</van-dialog>
</div>
</
template
>
<
script
>
import
{
getUsersByAccount
}
from
'@/api/userSystem'
import
{
completeTask
}
from
'@/api/taskDetail'
export
default
{
props
:
{
basicData
:
{
type
:
Object
,
require
:
true
}
},
data
()
{
return
{
show
:
false
,
search_value
:
''
,
value
:
''
,
selectList
:
[]
}
},
components
:
{
},
watch
:
{
search_value
(
value
)
{
if
(
value
&&
value
.
length
>
1
)
{
this
.
SearchFilterEvent
(
value
)
}
}
},
created
()
{
},
mounted
()
{
},
methods
:
{
SearchFilterEvent
(
value
)
{
let
array
=
[]
getUsersByAccount
({
userAccount
:
value
}).
then
(
res
=>
{
array
=
res
.
items
.
map
(
item
=>
{
return
{
id
:
item
.
id
,
label
:
`
${
item
.
name
}
(
${
item
.
num
}
)`
}
})
this
.
selectList
=
array
})
},
async
beforeClose
(
action
,
done
)
{
// if (action === 'confirm') {
// setTimeout(done, 1000)
// } else {
// done()
// }
await
this
.
delegateTask
(
this
.
value
)
},
SelectEvent
(
item
)
{
// this.delegateTask(item.id)
},
// 重新指派
delegateTask
(
userId
)
{
const
params
=
{
operationName
:
'delegateTask'
,
operator
:
localStorage
.
getItem
(
'userId'
),
id
:
this
.
basicData
.
id
,
targetUserId
:
userId
,
processDefinitionId
:
this
.
basicData
.
processDefinitionId
,
processInstId
:
this
.
basicData
.
processInstanceId
,
taskDefinitionKey
:
this
.
basicData
.
taskDefinitionKey
}
this
.
handleFinish
(
params
)
},
handleFinish
(
params
,
callback
,
errCallBack
)
{
completeTask
(
params
).
then
(
res
=>
{
this
.
$router
.
go
(
-
1
)
}).
catch
(
res
=>
{
if
(
errCallBack
instanceof
Function
)
errCallBack
(
res
)
})
}
}
}
</
script
>
<
style
lang=
"scss"
>
.choose-person
{
padding
:
15px
0px
30px
;
box-sizing
:
border-box
;
.dialog-box
{
height
:
200px
;
}
.select-box
{
padding
:
0px
15px
0px
;
}
.van-radio
{
padding
:
10px
0px
;
border-bottom
:
1px
solid
#efefef
;
}
}
</
style
>
src/views/busniessComponents/workFlowTask/taskDetails/components/taskBtn/index.vue
View file @
4b2ed69a
...
@@ -2,8 +2,8 @@
...
@@ -2,8 +2,8 @@
<div
class=
"task-btn"
>
<div
class=
"task-btn"
>
<!--
<van-button
type=
"info"
round
size=
"small"
@
click=
"reassign"
>
重新指派
</van-button>
<!--
<van-button
type=
"info"
round
size=
"small"
@
click=
"reassign"
>
重新指派
</van-button>
<van-button
type=
"info"
round
size=
"small"
@
click=
"finishTask"
>
完成任务
</van-button>
-->
<van-button
type=
"info"
round
size=
"small"
@
click=
"finishTask"
>
完成任务
</van-button>
-->
<van-button
type=
"default"
size=
"small"
round
@
click=
"reassign"
>
<van-button
v-if=
"appointShow"
type=
"default"
size=
"small"
round
@
click=
"reassign"
>
重新指
派
委
派
</van-button>
</van-button>
<van-button
<van-button
type=
"info"
type=
"info"
...
@@ -13,9 +13,12 @@
...
@@ -13,9 +13,12 @@
@
click=
"finishTask"
@
click=
"finishTask"
>
完成任务
</van-button
>
完成任务
</van-button
>
>
<choose-person
:basicData=
"basicData"
ref=
"choosePerson"
></choose-person>
</div>
</div>
</
template
>
</
template
>
<
script
>
<
script
>
import
choosePerson
from
'./components/choosePerson.vue'
export
default
{
export
default
{
props
:
{
props
:
{
basicData
:
{
basicData
:
{
...
@@ -23,16 +26,29 @@ export default {
...
@@ -23,16 +26,29 @@ export default {
require
:
true
require
:
true
}
}
},
},
components
:
{
choosePerson
},
data
()
{
data
()
{
return
{
return
{
comLoading
:
false
comLoading
:
false
}
}
},
},
computed
:
{
appointShow
:
{
get
()
{
return
this
.
basicData
?.
operationInfo
?.
find
(
item
=>
item
?.
pluginInfo
?.
label
===
'委派'
)
}
}
},
watch
:
{
},
created
()
{
},
created
()
{
},
mounted
()
{
},
mounted
()
{
},
methods
:
{
methods
:
{
reassign
()
{
reassign
()
{
console
.
log
(
'重新指派!'
)
this
.
$refs
.
choosePerson
.
show
=
true
},
},
finishTask
()
{
finishTask
()
{
this
.
comLoading
=
true
this
.
comLoading
=
true
...
...
src/views/todoList/components/todoListLazyCell.vue
View file @
4b2ed69a
...
@@ -64,7 +64,6 @@ export default {
...
@@ -64,7 +64,6 @@ export default {
methods
:
{
methods
:
{
// 跳转详情页面
// 跳转详情页面
goDetailsInfo
(
item
)
{
goDetailsInfo
(
item
)
{
console
.
log
(
'item'
,
item
)
if
(
this
.
$route
.
query
.
title
===
'我发起的任务'
)
{
if
(
this
.
$route
.
query
.
title
===
'我发起的任务'
)
{
localStorage
.
setItem
(
'taskInfo'
,
JSON
.
stringify
(
item
))
localStorage
.
setItem
(
'taskInfo'
,
JSON
.
stringify
(
item
))
this
.
$router
.
push
({
this
.
$router
.
push
({
...
...
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