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
6d618a4d
Commit
6d618a4d
authored
Sep 27, 2024
by
xioln
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
返回方式修改、行动项附件查看
parent
b5cd5623
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
130 additions
and
10 deletions
+130
-10
apiUrl.js
public/apiUrl.js
+13
-2
App.vue
src/App.vue
+1
-1
index.vue
src/components/pdf/index.vue
+1
-1
util.js
src/utils/util.js
+25
-1
index.vue
src/views/InfoDetail/components/actionAttachment/index.vue
+79
-0
index.vue
src/views/InfoDetail/index.vue
+8
-2
choosePerson.vue
...askDetails/components/taskBtn/components/choosePerson.vue
+1
-1
index.vue
...ews/busniessComponents/workFlowTask/taskDetails/index.vue
+1
-1
index.vue
src/views/empty/index.vue
+1
-1
No files found.
public/apiUrl.js
View file @
6d618a4d
const
LOCALHOST
=
`
${
window
.
location
.
origin
.
split
(
':'
)[
0
]}
:
${
window
.
location
.
origin
.
split
(
':'
)[
1
]}
:`
// 开发环境
// const
VUE_APP_BASE_API = 'http://119.91.70.186:9002' // eslint-disable-line
// const
PORT = '9002'
// 测试环境
const
VUE_APP_BASE_API
=
'http://218.75.209.68:9002'
// eslint-disable-line
// const PORT = '9002'
// 生产环境
const
PORT
=
'9351'
// const VUE_APP_BASE_API = LOCALHOST + PORT // eslint-disable-line
// 开发环境
const
VUE_APP_BASE_API
=
'http://192.168.1.133:9002'
// eslint-disable-line
// 测试环境
// const VUE_APP_BASE_API = 'http://218.75.209.68:9002' // eslint-disable-line
// 生产外网环境
// const VUE_APP_BASE_API = 'http://218.75.209.68:9351' // eslint-disable-line
// 生产环境
// const VUE_APP_BASE_API = LOCALHOST +'9351' // eslint-disable-line
// 本地
// const SUPPLIER_BASE_IP = 'localhost/#/home' // eslint-disable-line
// const GACE_BASE_IP = 'http://192.168.31.30:9303/#/home' // eslint-disable-line
src/App.vue
View file @
6d618a4d
...
...
@@ -65,7 +65,7 @@ export default {
},
methods
:
{
onClickLeft
()
{
this
.
$router
.
go
(
-
1
)
this
.
$router
.
back
(
)
}
}
}
...
...
src/components/pdf/index.vue
View file @
6d618a4d
...
...
@@ -247,7 +247,7 @@ export default {
this
.
$refs
.
pdf
.
print
(
100
,
[
1
,
2
])
},
onClickLeft
()
{
this
.
$router
.
go
(
-
1
)
this
.
$router
.
back
(
)
}
}
}
...
...
src/utils/util.js
View file @
6d618a4d
...
...
@@ -479,4 +479,28 @@ export function guid () {
return
v
.
toString
(
16
)
})
}
export
default
{
getCookie
,
showMessage
,
guid
}
export
function
formatGMK
(
size
)
{
if
(
size
===
0
)
{
return
0
}
if
(
!
size
)
{
return
''
}
if
(
size
.
includes
(
'b'
)
||
size
.
includes
(
'B'
))
{
return
size
}
const
num
=
parseInt
(
size
)
if
(
num
>
0.9
*
1024
*
1024
*
1024
)
{
return
parseFloat
(
num
/
(
1024
*
1024
*
1024
)).
toFixed
(
2
)
+
'GB'
}
if
(
num
>
0.9
*
1024
*
1024
)
{
return
parseFloat
(
num
/
(
1024
*
1024
)).
toFixed
(
2
)
+
'MB'
}
if
(
num
>
0.9
*
1024
)
{
return
parseFloat
(
num
/
1024
).
toFixed
(
2
)
+
'KB'
}
return
num
}
export
default
{
getCookie
,
showMessage
,
guid
,
formatGMK
}
src/views/InfoDetail/components/actionAttachment/index.vue
0 → 100644
View file @
6d618a4d
<
template
>
<div
class=
"action-attachment"
>
<table-cell
ref=
"tableCell"
:tableData=
"tableData"
:tableColumns=
"columns"
></table-cell>
<van-loading
v-if=
"!tableData"
type=
"spinner"
size=
"24px"
vertical
/>
<van-empty
v-if=
"tableData.length === 0"
description=
"数据为空"
/>
</div>
</
template
>
<
script
>
import
TableCell
from
'@/components/tableCell'
export
default
{
props
:
{
basicData
:
{
type
:
Object
,
default
:
()
=>
{
}
}
},
components
:
{
TableCell
},
data
()
{
return
{
columns
:
[
{
title
:
'文件名'
,
key
:
'originalFileName'
},
{
title
:
'文件大小'
,
key
:
'fileSize'
},
{
title
:
'扩展名'
,
key
:
'fileExtension'
},
{
title
:
'创建者'
,
key
:
'creator.userName'
}
],
allTableData
:
{},
activeNames
:
[],
tableData
:
[]
}
},
watch
:
{
'basicData.objFileLinks'
:
{
deep
:
true
,
handler
:
function
(
val
)
{
if
(
val
.
length
>
0
)
{
this
.
tableData
=
val
.
map
(
item
=>
{
item
.
target
.
fileSize
=
this
.
$utils
.
formatGMK
(
item
.
target
.
fileSize
)
return
item
.
target
})
}
},
immediate
:
true
}
},
created
()
{
},
mounted
()
{
},
computed
:
{},
methods
:
{
}
}
</
script
>
<
style
lang=
"scss"
scoped
>
.action-attachment
{
padding
:
10px
;
}
</
style
>
src/views/InfoDetail/index.vue
View file @
6d618a4d
...
...
@@ -33,6 +33,9 @@
<div
v-if=
"activeTab === 'extMaterialBillTab'"
>
<ExtMaterialBillTab
:basicData=
"form"
/>
</div>
<div
v-if=
"activeTab === 'actionAttachment'"
>
<ActionAttachment
:basicData=
"form"
/>
</div>
</van-tab>
</van-tabs>
</div>
...
...
@@ -46,6 +49,7 @@ import EcrTab from './components/ecrTab'
import
DxBaseTab
from
'./components/dxBaseTab'
import
DxPartTab
from
'./components/dxPartTab'
import
ExtMaterialBillTab
from
'./components/extMaterialBillTab'
import
ActionAttachment
from
'./components/actionAttachment'
import
{
getInstancePbo
,
getLayOut
}
from
'@/api/taskDetail'
import
DeeForm
from
'@/components/form/form'
...
...
@@ -58,7 +62,8 @@ export default {
EcrTab
,
DxBaseTab
,
DxPartTab
,
ExtMaterialBillTab
ExtMaterialBillTab
,
ActionAttachment
},
data
()
{
return
{
...
...
@@ -141,7 +146,8 @@ export default {
}
else
if
([
'ExtActionInfo'
].
includes
(
this
.
$route
.
query
.
dxClassname
))
{
this
.
tabs
=
[
{
title
:
'基本信息'
,
key
:
'baseInfo'
},
{
title
:
'行动项条目'
,
key
:
'ActionItem'
}
{
title
:
'行动项条目'
,
key
:
'ActionItem'
},
{
title
:
'附件'
,
key
:
'actionAttachment'
}
]
this
.
activeTab
=
'baseInfo'
await
this
.
getFormData
()
...
...
src/views/busniessComponents/workFlowTask/taskDetails/components/taskBtn/components/choosePerson.vue
View file @
6d618a4d
...
...
@@ -98,7 +98,7 @@ export default {
},
handleFinish
(
params
,
callback
,
errCallBack
)
{
completeTask
(
params
).
then
(
res
=>
{
this
.
$router
.
go
(
-
1
)
this
.
$router
.
back
(
)
}).
catch
(
res
=>
{
if
(
errCallBack
instanceof
Function
)
errCallBack
(
res
)
})
...
...
src/views/busniessComponents/workFlowTask/taskDetails/index.vue
View file @
6d618a4d
...
...
@@ -309,7 +309,7 @@ export default {
onOpened
:
()
=>
{
// sessionStorage.setItem('finishWork', true)
this
.
$refs
.
taskBtnRef
.
comLoading
=
false
this
.
$router
.
go
(
-
1
)
this
.
$router
.
back
(
)
// if (this.todoListTitle.includes('待办')) {
// this.$router.push({
// path: '/todoList?title=待办任务'
...
...
src/views/empty/index.vue
View file @
6d618a4d
...
...
@@ -16,7 +16,7 @@ export default {
},
created
()
{
if
(
this
.
$route
.
query
.
empty
===
2
)
{
this
.
$router
.
go
(
-
1
)
this
.
$router
.
back
(
)
}
else
{
this
.
$router
.
push
({
path
:
this
.
$route
.
query
.
path
,
...
...
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