Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
J
jiedao-app-operator-master
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
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
lanbaoming
jiedao-app-operator-master
Commits
0fbc9a35
Commit
0fbc9a35
authored
Mar 05, 2023
by
dragondean@qq.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
订单导出异常和客户延期异常
parent
2c0cf40f
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
17 additions
and
5 deletions
+17
-5
order.js
src/api/ecw/order.js
+3
-0
detail.vue
src/views/bpm/processInstance/detail.vue
+1
-1
Delay.vue
src/views/ecw/customer/components/Delay.vue
+12
-4
index.vue
src/views/ecw/order/index.vue
+1
-0
No files found.
src/api/ecw/order.js
View file @
0fbc9a35
...
@@ -547,6 +547,7 @@ export function orderExportSearch(params){
...
@@ -547,6 +547,7 @@ export function orderExportSearch(params){
return
request
({
return
request
({
url
:
'
/ecw/order/export/search
'
,
url
:
'
/ecw/order/export/search
'
,
method
:
'
GET
'
,
method
:
'
GET
'
,
responseType
:
'
arraybuffer
'
,
params
params
})
})
}
}
...
@@ -555,6 +556,7 @@ export function orderExportSearch(params){
...
@@ -555,6 +556,7 @@ export function orderExportSearch(params){
export
function
orderExportMySearch
(
params
){
export
function
orderExportMySearch
(
params
){
return
request
({
return
request
({
url
:
'
/ecw/order/export/my/search
'
,
url
:
'
/ecw/order/export/my/search
'
,
responseType
:
'
arraybuffer
'
,
method
:
'
GET
'
,
method
:
'
GET
'
,
params
params
})
})
...
@@ -565,6 +567,7 @@ export function orderExportDeptSearch(params){
...
@@ -565,6 +567,7 @@ export function orderExportDeptSearch(params){
return
request
({
return
request
({
url
:
'
/ecw/order/export/dept/search
'
,
url
:
'
/ecw/order/export/dept/search
'
,
method
:
'
GET
'
,
method
:
'
GET
'
,
responseType
:
'
arraybuffer
'
,
params
params
})
})
}
}
\ No newline at end of file
src/views/bpm/processInstance/detail.vue
View file @
0fbc9a35
...
@@ -340,7 +340,7 @@ export default {
...
@@ -340,7 +340,7 @@ export default {
path
:
this
.
processInstance
.
processDefinition
?.
formCustomViewPath
path
:
this
.
processInstance
.
processDefinition
?.
formCustomViewPath
},
},
}
}
console
.
log
(
this
.
processInstance
.
processDefinition
.
formCustomViewPath
.
trim
())
console
.
log
(
'
formCustomViewPath
'
,
this
.
processInstance
.
processDefinition
.
formCustomViewPath
.
trim
())
return
map
[
this
.
processInstance
.
processDefinition
.
formCustomViewPath
.
trim
()]
return
map
[
this
.
processInstance
.
processDefinition
.
formCustomViewPath
.
trim
()]
}
}
},
},
...
...
src/views/ecw/customer/components/Delay.vue
View file @
0fbc9a35
<
template
>
<
template
>
<div>
<div>
<el-descriptions
:column=
"4"
>
<el-descriptions
:column=
"4"
>
<el-descriptions-item
:label=
"$t('客户编号')"
>
{{
detail
.
customer
Id
}}
</el-descriptions-item>
<el-descriptions-item
:label=
"$t('客户编号')"
>
{{
detail
.
customer
Number
}}
</el-descriptions-item>
<el-descriptions-item
:label=
"$t('客户名称')"
>
{{
detail
.
customerName
}}
</el-descriptions-item>
<el-descriptions-item
:label=
"$t('客户名称')"
>
{{
detail
.
customerName
}}
</el-descriptions-item>
<el-descriptions-item
:label=
"$t('跟进客服')"
>
{{
detail
.
followUpSalesmanName
}}
</el-descriptions-item>
<el-descriptions-item
:label=
"$t('跟进客服')"
>
{{
detail
.
followUpSalesmanName
}}
</el-descriptions-item>
<el-descriptions-item
:label=
"$t('创建时间')"
>
{{
detail
.
createTime
|
parseTime
}}
</el-descriptions-item>
<el-descriptions-item
:label=
"$t('创建时间')"
>
{{
parseTime
(
detail
.
createTime
)
}}
</el-descriptions-item>
<el-descriptions-item
:label=
"$t('申请凭证')"
:span=
"4"
>
<el-descriptions-item
:label=
"$t('申请凭证')"
:span=
"4"
>
<el-image
v-for=
"(item, index) in pictures"
:key=
"index"
:src=
"item"
style=
"width:100px; height:100px"
:preview-src-list=
"pictures"
></el-image>
<el-image
v-for=
"(item, index) in pictures"
:key=
"index"
:src=
"item"
style=
"width:100px; height:100px"
:preview-src-list=
"pictures"
></el-image>
</el-descriptions-item>
</el-descriptions-item>
<el-descriptions-item
:label=
"$t('申请原因')"
:span=
"4"
>
{{
detail
.
reason
}}
</el-descriptions-item>
<el-descriptions-item
:label=
"$t('申请原因')"
:span=
"4"
>
{{
$t
(
'
客户原计划调入公海池时间:{time
}
'
,
{
time
:
parseTime
(
detail
.
orgEstimateEnterOpenSeaTime
,
'
{y
}
-{m
}
-{d
}
'
)
}
)
}}
,
{{
$t
(
'
申请延期后时间:{time
}
'
,
{
time
:
parseTime
(
detail
.
estimateEnterOpenSeaTime
,
'
{y
}
-{m
}
-{d
}
'
)
}
)
}}
;
{{
$t
(
'
原因
'
)
}}
:
{{
detail
.
reason
}}
<
/el-descriptions-item
>
<
/el-descriptions
>
<
/el-descriptions
>
<
/div
>
<
/div
>
<
/template
>
<
/template
>
...
@@ -16,7 +24,6 @@
...
@@ -16,7 +24,6 @@
import
{
getApproval
}
from
'
@/api/ecw/customer
'
;
import
{
getApproval
}
from
'
@/api/ecw/customer
'
;
import
{
parseTime
}
from
'
@/utils/ruoyi
'
import
{
parseTime
}
from
'
@/utils/ruoyi
'
export
default
{
export
default
{
filters
:
{
parseTime
},
props
:{
props
:{
id
:
[
String
,
Number
]
id
:
[
String
,
Number
]
}
,
}
,
...
@@ -36,6 +43,7 @@ export default {
...
@@ -36,6 +43,7 @@ export default {
}
}
}
,
}
,
created
(){
created
(){
parseTime
,
getApproval
(
this
.
id
).
then
(
res
=>
{
getApproval
(
this
.
id
).
then
(
res
=>
{
this
.
info
=
res
.
data
this
.
info
=
res
.
data
}
)
}
)
...
...
src/views/ecw/order/index.vue
View file @
0fbc9a35
...
@@ -631,6 +631,7 @@ export default {
...
@@ -631,6 +631,7 @@ export default {
exportExcel
(
func
,
params
,
fileName
=
null
){
exportExcel
(
func
,
params
,
fileName
=
null
){
this
.
exportLoading
=
true
;
this
.
exportLoading
=
true
;
func
(
params
).
then
(
res
=>
{
func
(
params
).
then
(
res
=>
{
console
.
log
({
res
})
if
(
!
fileName
){
if
(
!
fileName
){
fileName
=
this
.
$t
(
'
订单
'
)
fileName
=
this
.
$t
(
'
订单
'
)
}
}
...
...
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