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
03c70c38
Commit
03c70c38
authored
Sep 20, 2022
by
dcy
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/dev' into dev
parents
680a28ce
a427b494
Changes
14
Hide whitespace changes
Inline
Side-by-side
Showing
14 changed files
with
591 additions
and
66 deletions
+591
-66
futureBox.js
src/api/ecw/futureBox.js
+54
-0
index.vue
src/components/CustomerFollow/index.vue
+28
-1
index.vue
src/components/CustomerFollowList/index.vue
+33
-3
index.vue
src/components/NeedKnow/index.vue
+1
-1
main.js
src/main.js
+19
-0
indexFutureBox.vue
src/views/ecw/box/indexFutureBox.vue
+354
-0
index.vue
src/views/ecw/customerComplaint/index.vue
+20
-8
edit.vue
src/views/ecw/offer/edit.vue
+15
-8
PrintWarehouseReceipt.vue
src/views/ecw/order/components/PrintWarehouseReceipt.vue
+2
-2
create.vue
src/views/ecw/order/create.vue
+6
-0
edit.vue
src/views/ecw/order/edit.vue
+42
-25
index.vue
src/views/ecw/order/exception/index.vue
+0
-1
pending.vue
src/views/ecw/order/pending.vue
+8
-8
index.vue
src/views/system/internalMessage/index.vue
+9
-9
No files found.
src/api/ecw/futureBox.js
0 → 100644
View file @
03c70c38
import
request
from
'
@/utils/request
'
// 创建预定舱计划
export
function
createFutureBox
(
data
)
{
return
request
({
url
:
'
/ecw/future-box/create
'
,
method
:
'
post
'
,
data
:
data
})
}
// 更新预定舱计划
export
function
updateFutureBox
(
data
)
{
return
request
({
url
:
'
/ecw/future-box/update
'
,
method
:
'
put
'
,
data
:
data
})
}
// 删除预定舱计划
export
function
deleteFutureBox
(
id
)
{
return
request
({
url
:
'
/ecw/future-box/delete?id=
'
+
id
,
method
:
'
delete
'
})
}
// 获得预定舱计划
export
function
getFutureBox
(
id
)
{
return
request
({
url
:
'
/ecw/future-box/get?id=
'
+
id
,
method
:
'
get
'
})
}
// 获得预定舱计划分页
export
function
getFutureBoxPage
(
query
)
{
return
request
({
url
:
'
/ecw/future-box/page
'
,
method
:
'
get
'
,
params
:
query
})
}
// 导出预定舱计划 Excel
export
function
exportFutureBoxExcel
(
query
)
{
return
request
({
url
:
'
/ecw/future-box/export-excel
'
,
method
:
'
get
'
,
params
:
query
,
responseType
:
'
blob
'
})
}
src/components/CustomerFollow/index.vue
View file @
03c70c38
...
@@ -173,7 +173,34 @@ export default {
...
@@ -173,7 +173,34 @@ export default {
if
(
!
valid
)
{
if
(
!
valid
)
{
return
return
}
}
if
(
!
this
.
customerFollow
.
form
.
followType
){
this
.
$modal
.
msgError
(
"
请选择跟进类型
"
);
return
}
if
(
!
this
.
customerFollow
.
form
.
followTime
){
this
.
$modal
.
msgError
(
"
请选择跟进时间
"
);
return
}
if
(
!
this
.
customerFollow
.
form
.
contactName
){
this
.
$modal
.
msgError
(
"
请选择联系人
"
);
return
}
if
(
!
this
.
customerFollow
.
form
.
followUserId
){
this
.
$modal
.
msgError
(
"
请选择跟进业务
"
);
return
}
if
(
!
this
.
customerFollow
.
form
.
followMethod
){
this
.
$modal
.
msgError
(
"
请选择跟进方式
"
);
return
}
if
(
!
this
.
customerFollow
.
form
.
feedback
){
this
.
$modal
.
msgError
(
"
请输入客户反馈
"
);
return
}
if
(
!
this
.
customerFollow
.
form
.
result
){
this
.
$modal
.
msgError
(
"
请输入处理结果
"
);
return
}
createCustomerFollow
(
this
.
customerFollow
.
form
).
then
(
r
=>
{
createCustomerFollow
(
this
.
customerFollow
.
form
).
then
(
r
=>
{
this
.
resetCustomerFollowForm
()
this
.
resetCustomerFollowForm
()
this
.
getCustomerFollowList
()
this
.
getCustomerFollowList
()
...
...
src/components/CustomerFollowList/index.vue
View file @
03c70c38
...
@@ -15,7 +15,7 @@
...
@@ -15,7 +15,7 @@
</el-col>
</el-col>
<el-col
:span=
"12"
>
<el-col
:span=
"12"
>
<el-form-item
label=
"跟进时间"
required
>
<el-form-item
label=
"跟进时间"
required
>
<el-date-picker
v-model=
"customerFollow.form.followTime"
type=
"datetime"
placeholder=
"选择跟进时间"
></el-date-picker>
<el-date-picker
v-model=
"customerFollow.form.followTime"
value-format=
"yyyy-MM-dd HH:mm:ss"
format=
"yyyy-MM-dd HH:mm:ss"
type=
"datetime"
placeholder=
"选择跟进时间"
></el-date-picker>
</el-form-item>
</el-form-item>
</el-col>
</el-col>
<el-col
:span=
"12"
>
<el-col
:span=
"12"
>
...
@@ -103,8 +103,10 @@ export default {
...
@@ -103,8 +103,10 @@ export default {
},
},
created
()
{
created
()
{
this
.
resetCustomerFollowForm
()
if
(
!!
this
.
customerId
)
getCustomerContactsListByCustomer
({
customerId
:
this
.
customerId
}).
then
(
r
=>
{
if
(
!!
this
.
customerId
)
getCustomerContactsListByCustomer
({
customerId
:
this
.
customerId
}).
then
(
r
=>
{
this
.
customerContactsList
=
r
.
data
this
.
customerContactsList
=
r
.
data
this
.
customerFollow
.
form
.
customerId
=
this
.
customerId
})
})
listServiceUser
().
then
(
r
=>
{
listServiceUser
().
then
(
r
=>
{
this
.
serviceUserList
=
r
.
data
this
.
serviceUserList
=
r
.
data
...
@@ -116,7 +118,34 @@ export default {
...
@@ -116,7 +118,34 @@ export default {
if
(
!
valid
)
{
if
(
!
valid
)
{
return
return
}
}
if
(
!
this
.
customerFollow
.
form
.
followType
){
this
.
$modal
.
msgError
(
"
请选择跟进类型
"
);
return
}
if
(
!
this
.
customerFollow
.
form
.
followTime
){
this
.
$modal
.
msgError
(
"
请选择跟进时间
"
);
return
}
if
(
!
this
.
customerFollow
.
form
.
contactName
){
this
.
$modal
.
msgError
(
"
请选择联系人
"
);
return
}
if
(
!
this
.
customerFollow
.
form
.
followUserId
){
this
.
$modal
.
msgError
(
"
请选择跟进业务
"
);
return
}
if
(
!
this
.
customerFollow
.
form
.
followMethod
){
this
.
$modal
.
msgError
(
"
请选择跟进方式
"
);
return
}
if
(
!
this
.
customerFollow
.
form
.
feedback
){
this
.
$modal
.
msgError
(
"
请输入客户反馈
"
);
return
}
if
(
!
this
.
customerFollow
.
form
.
result
){
this
.
$modal
.
msgError
(
"
请输入处理结果
"
);
return
}
createCustomerFollow
(
this
.
customerFollow
.
form
).
then
(
r
=>
{
createCustomerFollow
(
this
.
customerFollow
.
form
).
then
(
r
=>
{
this
.
resetCustomerFollowForm
()
this
.
resetCustomerFollowForm
()
this
.
customerFollow
.
dialogVisible
=
false
this
.
customerFollow
.
dialogVisible
=
false
...
@@ -126,7 +155,8 @@ export default {
...
@@ -126,7 +155,8 @@ export default {
resetCustomerFollowForm
()
{
resetCustomerFollowForm
()
{
this
.
customerFollow
.
form
=
{
this
.
customerFollow
.
form
=
{
"
bizId
"
:
undefined
,
"
bizId
"
:
this
.
id
,
"
customerId
"
:
this
.
customerId
,
"
contactName
"
:
undefined
,
"
contactName
"
:
undefined
,
"
feedback
"
:
undefined
,
"
feedback
"
:
undefined
,
"
followMethod
"
:
undefined
,
"
followMethod
"
:
undefined
,
...
...
src/components/NeedKnow/index.vue
View file @
03c70c38
...
@@ -26,7 +26,7 @@ export default {
...
@@ -26,7 +26,7 @@ export default {
methods
:{
methods
:{
downloadPdf
(){
downloadPdf
(){
download
({
id
:
this
.
detail
.
id
}).
then
(
res
=>
{
download
({
id
:
this
.
detail
.
id
}).
then
(
res
=>
{
saveFie
.
pdf
(
res
,
'
入仓须知.pdf
'
)
this
.
$download
.
pdf
(
res
,
'
入仓须知.pdf
'
)
})
})
},
},
download
(){
download
(){
...
...
src/main.js
View file @
03c70c38
...
@@ -108,11 +108,30 @@ import '@/styles/index.scss'
...
@@ -108,11 +108,30 @@ import '@/styles/index.scss'
Vue
.
use
(
Element
,
{
Vue
.
use
(
Element
,
{
size
:
Cookies
.
get
(
'
size
'
)
||
'
medium
'
// set element-ui default size
size
:
Cookies
.
get
(
'
size
'
)
||
'
medium
'
// set element-ui default size
})
})
// 重定向路由(关闭当前标签)
Vue
.
prototype
.
$redirect
=
(
path
)
=>
{
Vue
.
prototype
.
$redirect
=
(
path
)
=>
{
let
currentView
=
router
.
history
.
current
let
currentView
=
router
.
history
.
current
router
.
replace
(
path
)
router
.
replace
(
path
)
store
.
dispatch
(
"
tagsView/delView
"
,
currentView
)
store
.
dispatch
(
"
tagsView/delView
"
,
currentView
)
}
}
window
.
ElementUI
=
Element
// 显示表单错误信息
Vue
.
prototype
.
$showFormValidateErrors
=
(
errors
)
=>
{
let
vm
=
new
Vue
()
let
createElement
=
vm
.
$createElement
let
fieldList
=
Object
.
values
(
errors
)
Element
.
Notification
({
title
:
'
表单错误
'
,
type
:
'
warning
'
,
duration
:
3000
,
message
:
createElement
(
'
div
'
,
fieldList
.
map
(
function
(
errorList
)
{
return
createElement
(
'
div
'
,
errorList
.
map
((
item
)
=>
{
return
createElement
(
'
div
'
,
item
.
message
)
}))
}))
})
}
Vue
.
config
.
productionTip
=
false
Vue
.
config
.
productionTip
=
false
...
...
src/views/ecw/box/indexFutureBox.vue
0 → 100644
View file @
03c70c38
<
template
>
<div
class=
"app-container"
>
<!-- 搜索工作栏 -->
<el-form
:model=
"queryParams"
ref=
"queryForm"
size=
"small"
:inline=
"true"
v-show=
"showSearch"
label-width=
"68px"
>
<el-form-item
label=
"运输方式"
prop=
"transportType"
>
<el-select
v-model=
"queryParams.transportType"
placeholder=
"请选择运输方式"
clearable
size=
"small"
>
<el-option
v-for=
"dict in transportTypes"
:key=
"dict.value"
:label=
"dict.label"
:value=
"dict.value"
/>
</el-select>
</el-form-item>
<el-form-item
label=
"始发地"
prop=
"startWarehouseId"
>
<el-select
v-model=
"queryParams.startWarehouseId"
placeholder=
"请选择始发地"
>
<el-option
v-for=
"item in exportWarehouseList"
:label=
"item.titleZh"
:value=
"item.id"
:key=
"item.id"
></el-option>
</el-select>
</el-form-item>
<el-form-item
label=
"目的地"
prop=
"destWarehouseId"
>
<el-select
v-model=
"queryParams.destWarehouseId"
placeholder=
"请选择目的地"
>
<el-option
v-for=
"item in importWarehouseList"
:label=
"item.titleZh"
:value=
"item.id"
:key=
"item.id"
></el-option>
</el-select>
</el-form-item>
<el-form-item>
<el-button
type=
"primary"
icon=
"el-icon-search"
@
click=
"handleQuery"
>
搜索
</el-button>
<el-button
icon=
"el-icon-refresh"
@
click=
"resetQuery"
>
重置
</el-button>
</el-form-item>
</el-form>
<!-- 操作工具栏 -->
<el-row
:gutter=
"10"
class=
"mb8"
>
<el-col
:span=
"1.5"
>
<el-button
type=
"primary"
plain
icon=
"el-icon-plus"
size=
"mini"
@
click=
"handleAdd"
v-hasPermi=
"['ecw:future-box:create']"
>
新增
</el-button>
</el-col>
<el-col
:span=
"1.5"
>
<el-button
type=
"warning"
plain
icon=
"el-icon-download"
size=
"mini"
@
click=
"handleExport"
:loading=
"exportLoading"
v-hasPermi=
"['ecw:future-box:export']"
>
导出
</el-button>
</el-col>
<right-toolbar
:showSearch.sync=
"showSearch"
@
queryTable=
"getList"
></right-toolbar>
</el-row>
<!-- 列表 -->
<el-table
v-loading=
"loading"
:data=
"list"
>
<el-table-column
label=
"主键ID"
align=
"center"
prop=
"id"
/>
<el-table-column
label=
"始发地"
align=
"center"
prop=
"startWarehouse"
/>
<el-table-column
label=
"目的地"
align=
"center"
prop=
"destWarehouse"
/>
<el-table-column
label=
"运输方式"
align=
"center"
prop=
"transportType"
>
<template
slot-scope=
"scope"
>
<dict-tag
:type=
"DICT_TYPE.ECW_TRANSPORT_TYPE"
:value=
"scope.row.transportType"
/>
</
template
>
</el-table-column>
<el-table-column
label=
"出货渠道"
align=
"center"
prop=
"shippingChannelId"
/>
<el-table-column
label=
"待入仓方数"
align=
"center"
prop=
"readyWarehousingNumber"
/>
<el-table-column
label=
"已入仓方数"
align=
"center"
prop=
"warehousedNumber"
/>
<el-table-column
label=
"在仓方数"
align=
"center"
prop=
"warehousingNumber"
/>
<el-table-column
label=
"已装柜方数"
align=
"center"
prop=
"loadingNumber"
/>
<el-table-column
label=
"创建时间"
align=
"center"
prop=
"createTime"
width=
"180"
>
<
template
slot-scope=
"scope"
>
<span>
{{
parseTime
(
scope
.
row
.
createTime
)
}}
</span>
</
template
>
</el-table-column>
<el-table-column
label=
"未来天数"
align=
"center"
prop=
"futureNumber"
/>
<el-table-column
label=
"计划货柜"
align=
"center"
prop=
"gpNumber"
>
<
template
slot-scope=
"{row}"
>
{{
row
.
gpNumber
}}
个40GP/
{{
row
.
hqNumber
}}
个40HQ
</
template
>
</el-table-column>
<el-table-column
label=
"未来计划方数"
align=
"center"
prop=
"futurePlanNumber"
/>
<el-table-column
label=
"未来实际方数"
align=
"center"
prop=
"actualNumber"
/>
<el-table-column
label=
"操作"
align=
"center"
class-name=
"small-padding fixed-width"
>
<
template
slot-scope=
"scope"
>
<el-button
size=
"mini"
type=
"text"
icon=
"el-icon-edit"
@
click=
"handleUpdate(scope.row)"
v-hasPermi=
"['ecw:future-box:update']"
>
编辑
</el-button>
<el-button
size=
"mini"
type=
"text"
icon=
"el-icon-delete"
@
click=
"handleDelete(scope.row)"
v-hasPermi=
"['ecw:future-box:delete']"
>
删除
</el-button>
</
template
>
</el-table-column>
</el-table>
<!-- 分页组件 -->
<pagination
v-show=
"total > 0"
:total=
"total"
:page.sync=
"queryParams.pageNo"
:limit.sync=
"queryParams.pageSize"
@
pagination=
"getList"
/>
<!-- 对话框(添加 / 修改) -->
<el-dialog
:title=
"title"
:visible.sync=
"open"
width=
"500px"
append-to-body
>
<el-form
ref=
"form"
:model=
"form"
:rules=
"rules"
label-width=
"80px"
>
<el-form-item
label=
"始发地"
prop=
"startWarehouseId"
>
<el-select
v-model=
"form.startWarehouseId"
placeholder=
"请选择始发地"
>
<el-option
v-for=
"item in exportWarehouseList"
:label=
"item.titleZh"
:value=
"item.id"
:key=
"item.id"
></el-option>
</el-select>
</el-form-item>
<el-form-item
label=
"目的地"
prop=
"destWarehouseId"
>
<el-select
v-model=
"form.destWarehouseId"
placeholder=
"请选择目的地"
>
<el-option
v-for=
"item in importWarehouseList"
:label=
"item.titleZh"
:value=
"item.id"
:key=
"item.id"
></el-option>
</el-select>
</el-form-item>
<el-form-item
label=
"运输方式"
prop=
"transportType"
>
<el-radio-group
v-model=
"form.transportType"
>
<el-radio
v-for=
"dict in transportTypes"
:key=
"dict.value"
:label=
"dict.value"
>
{{dict.label}}
</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item
label=
"出货渠道"
prop=
"shippingChannelId"
>
<el-select
v-model=
"form.shippingChannelId"
placeholder=
"请选择出货渠道"
>
<el-option
v-for=
"item in channelList"
:label=
"item.nameZh"
:value=
"item.channelId"
:key=
"item.channelId"
></el-option>
</el-select>
</el-form-item>
<el-form-item
label=
"待入仓方数"
prop=
"readyWarehousingNumber"
/>
<el-form-item
label=
"已入仓方数"
prop=
"warehousedNumber"
/>
<el-form-item
label=
"在仓方数"
prop=
"warehousingNumber"
/>
<el-form-item
label=
"已装柜仓数"
prop=
"loadingNumber"
/>
<el-form-item
label=
"未来"
/>
<el-form-item
prop=
"futureNumber"
>
<el-input
v-model=
"form.futureNumber"
placeholder=
"请输入未来货柜天数"
/>
</el-form-item>
<el-form-item
label=
"天货柜数"
/>
<el-form-item
prop=
"gpNumber"
>
<el-input
v-model=
"form.gpNumber"
placeholder=
"请输入GP"
/>
</el-form-item>
<el-form-item
label=
"x40GP"
/>
<el-form-item
prop=
"hqNumber"
>
<el-input
v-model=
"form.hqNumber"
placeholder=
"请输入hq"
/>
</el-form-item>
<el-form-item
label=
"x40HQ"
/>
<el-form-item
label=
"未来计划方数"
prop=
"futurePlanNumber"
>
<el-input
v-model=
"form.futurePlanNumber"
placeholder=
"请输入未来计划方数"
/>
</el-form-item>
<el-form-item
label=
"未来实际方数"
prop=
"actualNumber"
>
<el-input
v-model=
"form.actualNumber"
placeholder=
"请输入未来实际方数"
/>
</el-form-item>
</el-form>
<div
slot=
"footer"
class=
"dialog-footer"
>
<el-button
type=
"primary"
@
click=
"submitForm"
>
确 定
</el-button>
<el-button
@
click=
"cancel"
>
取 消
</el-button>
</div>
</el-dialog>
</div>
</template>
<
script
>
import
{
createFutureBox
,
updateFutureBox
,
deleteFutureBox
,
getFutureBox
,
getFutureBoxPage
,
exportFutureBoxExcel
}
from
"
@/api/ecw/futureBox
"
;
import
{
getCabinetPage
}
from
"
@/api/ecw/cabinet
"
;
import
{
getChannelList
}
from
'
@/api/ecw/channel
'
;
import
{
getWarehouseList
}
from
"
@/api/ecw/warehouse
"
export
default
{
name
:
"
FutureBox
"
,
components
:
{
},
data
()
{
return
{
// 遮罩层
loading
:
true
,
// 导出遮罩层
exportLoading
:
false
,
// 显示搜索条件
showSearch
:
true
,
// 总条数
total
:
0
,
// 预定舱计划列表
list
:
[],
// 弹出层标题
title
:
""
,
// 是否显示弹出层
open
:
false
,
dateRangeCreateTime
:
[],
// 查询参数
queryParams
:
{
pageNo
:
1
,
pageSize
:
10
,
startWarehouseId
:
null
,
destWarehouseId
:
null
,
transportType
:
null
,
readyWarehousingNumber
:
null
,
warehousedNumber
:
null
,
warehousingNumber
:
null
,
loadingNumber
:
null
,
futureNumber
:
null
,
gpNumber
:
null
,
hqNumber
:
null
,
futurePlanNumber
:
null
,
actualNumber
:
null
,
shippingChannelId
:
null
,
status
:
null
,
},
// 表单参数
form
:
{},
// 表单校验
rules
:
{
},
warehouseList
:
[]
};
},
computed
:
{
exportWarehouseList
()
{
return
this
.
warehouseList
.
filter
(
(
item
)
=>
item
.
tradeType
==
"
2
"
||
item
.
type
==
"
3
"
);
},
importWarehouseList
()
{
return
this
.
warehouseList
.
filter
(
(
item
)
=>
item
.
tradeType
==
"
1
"
||
item
.
type
==
"
3
"
);
},
getCabinetName
()
{
return
(
cabinetId
)
=>
{
for
(
let
index
in
this
.
cabinetList
)
{
let
cabinetItem
=
this
.
cabinetList
[
index
];
if
(
cabinetItem
.
id
==
cabinetId
)
{
return
cabinetItem
.
name
;
}
}
};
},
getShipChannelName
()
{
return
shippingChannelId
=>
{
for
(
let
index
in
this
.
channelList
)
{
let
channelItem
=
this
.
channelList
[
index
];
if
(
channelItem
.
channelId
==
shippingChannelId
)
{
return
channelItem
.
nameZh
;
}
}
return
'
/
'
}
}
},
created
()
{
this
.
transportTypes
=
this
.
getDictDatas
(
this
.
DICT_TYPE
.
ECW_TRANSPORT_TYPE
).
filter
((
item
)
=>
item
.
value
==
"
1
"
||
item
.
value
==
"
2
"
);
getWarehouseList
().
then
((
res
)
=>
(
this
.
warehouseList
=
res
.
data
));
getCabinetPage
(
null
).
then
((
response
)
=>
{
this
.
cabinetList
=
response
.
data
.
list
;
});
this
.
getList
();
},
methods
:
{
/** 查询列表 */
getList
()
{
this
.
loading
=
true
;
// 处理查询参数
let
params
=
{...
this
.
queryParams
};
this
.
addBeginAndEndTime
(
params
,
this
.
dateRangeCreateTime
,
'
createTime
'
);
// 执行查询
getFutureBoxPage
(
params
).
then
(
response
=>
{
this
.
list
=
response
.
data
.
list
;
this
.
total
=
response
.
data
.
total
;
this
.
loading
=
false
;
});
},
/** 取消按钮 */
cancel
()
{
this
.
open
=
false
;
this
.
reset
();
},
/** 表单重置 */
reset
()
{
this
.
form
=
{
id
:
undefined
,
startWarehouseId
:
undefined
,
destWarehouseId
:
undefined
,
transportType
:
undefined
,
readyWarehousingNumber
:
undefined
,
warehousedNumber
:
undefined
,
warehousingNumber
:
undefined
,
loadingNumber
:
undefined
,
futureNumber
:
undefined
,
gpNumber
:
undefined
,
hqNumber
:
undefined
,
futurePlanNumber
:
undefined
,
actualNumber
:
undefined
,
shippingChannelId
:
undefined
,
status
:
undefined
,
};
this
.
resetForm
(
"
form
"
);
},
/** 搜索按钮操作 */
handleQuery
()
{
this
.
queryParams
.
pageNo
=
1
;
this
.
getList
();
},
/** 重置按钮操作 */
resetQuery
()
{
this
.
dateRangeCreateTime
=
[];
this
.
resetForm
(
"
queryForm
"
);
this
.
handleQuery
();
},
/** 新增按钮操作 */
handleAdd
()
{
this
.
reset
();
this
.
open
=
true
;
this
.
title
=
"
添加预定舱计划
"
;
},
/** 修改按钮操作 */
handleUpdate
(
row
)
{
this
.
reset
();
const
id
=
row
.
id
;
getFutureBox
(
id
).
then
(
response
=>
{
this
.
form
=
response
.
data
;
this
.
open
=
true
;
this
.
title
=
"
修改预定舱计划
"
;
});
},
/** 提交按钮 */
submitForm
()
{
this
.
$refs
[
"
form
"
].
validate
(
valid
=>
{
if
(
!
valid
)
{
return
;
}
// 修改的提交
if
(
this
.
form
.
id
!=
null
)
{
updateFutureBox
(
this
.
form
).
then
(
response
=>
{
this
.
$modal
.
msgSuccess
(
"
修改成功
"
);
this
.
open
=
false
;
this
.
getList
();
});
return
;
}
// 添加的提交
createFutureBox
(
this
.
form
).
then
(
response
=>
{
this
.
$modal
.
msgSuccess
(
"
新增成功
"
);
this
.
open
=
false
;
this
.
getList
();
});
});
},
/** 删除按钮操作 */
handleDelete
(
row
)
{
const
id
=
row
.
id
;
this
.
$modal
.
confirm
(
'
是否确认删除预定舱计划编号为"
'
+
id
+
'
"的数据项?
'
).
then
(
function
()
{
return
deleteFutureBox
(
id
);
}).
then
(()
=>
{
this
.
getList
();
this
.
$modal
.
msgSuccess
(
"
删除成功
"
);
}).
catch
(()
=>
{});
},
/** 导出按钮操作 */
handleExport
()
{
// 处理查询参数
let
params
=
{...
this
.
queryParams
};
params
.
pageNo
=
undefined
;
params
.
pageSize
=
undefined
;
this
.
addBeginAndEndTime
(
params
,
this
.
dateRangeCreateTime
,
'
createTime
'
);
// 执行导出
this
.
$modal
.
confirm
(
'
是否确认导出所有预定舱计划数据项?
'
).
then
(()
=>
{
this
.
exportLoading
=
true
;
return
exportFutureBoxExcel
(
params
);
}).
then
(
response
=>
{
this
.
$download
.
excel
(
response
,
'
${table.classComment}.xls
'
);
this
.
exportLoading
=
false
;
}).
catch
(()
=>
{});
}
}
};
</
script
>
src/views/ecw/customerComplaint/index.vue
View file @
03c70c38
...
@@ -266,14 +266,14 @@
...
@@ -266,14 +266,14 @@
<dict-selector
:type=
"DICT_TYPE.CUSTOMER_COMPLAINT_STATUS"
form-type=
"radio"
v-model=
"form.status"
<dict-selector
:type=
"DICT_TYPE.CUSTOMER_COMPLAINT_STATUS"
form-type=
"radio"
v-model=
"form.status"
:filter=
"(e) => e.value == '2' || e.value == '3'"
:formatter=
"Number"
></dict-selector>
:filter=
"(e) => e.value == '2' || e.value == '3'"
:formatter=
"Number"
></dict-selector>
</el-form-item>
</el-form-item>
<el-form-item
v-show=
"form.status == '2'"
label=
"查明原因"
required
prop=
"ascertainReason"
>
<el-form-item
v-show=
"form.status == '2'"
label=
"查明原因"
required
>
<el-input
type=
"textarea"
placeholder=
"请输入查明原因"
v-model=
"form.ascertainReason"
></el-input>
<el-input
type=
"textarea"
placeholder=
"请输入查明原因"
v-model=
"form.ascertainReason"
></el-input>
</el-form-item>
</el-form-item>
<el-form-item
v-show=
"form.status == '2'"
label=
"处理方案"
>
<el-form-item
v-show=
"form.status == '2'"
label=
"处理方案"
>
<el-input
v-model=
"form.plan"
placeholder=
"请输入处理方案"
></el-input>
<el-input
v-model=
"form.plan"
placeholder=
"请输入处理方案"
></el-input>
</el-form-item>
</el-form-item>
<el-form-item
v-show=
"form.status == '3'"
label=
"处理结果"
required
prop=
"result"
>
<el-form-item
v-show=
"form.status == '3'"
label=
"处理结果"
required
>
<el-input
type=
"textarea"
placeholder=
"请输入处理结果"
v-model=
"form.result"
></el-input>
<el-input
type=
"textarea"
placeholder=
"请输入处理结果"
v-model=
"form.result"
></el-input>
</el-form-item>
</el-form-item>
<el-form-item
v-show=
"form.status == '3'"
label=
"赔付金额"
>
<el-form-item
v-show=
"form.status == '3'"
label=
"赔付金额"
>
...
@@ -287,7 +287,7 @@
...
@@ -287,7 +287,7 @@
:type=
"DICT_TYPE.COMMISSION_CURRENCY_TYPE"
></dict-selector>
:type=
"DICT_TYPE.COMMISSION_CURRENCY_TYPE"
></dict-selector>
</el-input>
</el-input>
</el-form-item>
</el-form-item>
<el-form-item
v-show=
"form.status == '3'"
label=
"处理时间"
required
prop=
"handleAt"
>
<el-form-item
v-show=
"form.status == '3'"
label=
"处理时间"
required
>
<el-date-picker
type=
"datetime"
v-model=
"form.handleAt"
value-format=
"yyyy-MM-dd HH:mm:ss"
format=
"yyyy-MM-dd HH:mm:ss"
></el-date-picker>
<el-date-picker
type=
"datetime"
v-model=
"form.handleAt"
value-format=
"yyyy-MM-dd HH:mm:ss"
format=
"yyyy-MM-dd HH:mm:ss"
></el-date-picker>
</el-form-item>
</el-form-item>
</el-form>
</el-form>
...
@@ -360,9 +360,6 @@ export default {
...
@@ -360,9 +360,6 @@ export default {
customerId
:
[{
required
:
true
,
message
:
"
客户名称不能为空
"
,
trigger
:
"
change
"
}],
customerId
:
[{
required
:
true
,
message
:
"
客户名称不能为空
"
,
trigger
:
"
change
"
}],
type
:
[{
required
:
true
,
message
:
"
投诉类型不能为空
"
,
trigger
:
"
change
"
}],
type
:
[{
required
:
true
,
message
:
"
投诉类型不能为空
"
,
trigger
:
"
change
"
}],
content
:
[{
required
:
true
,
message
:
"
投诉内容不能为空
"
,
trigger
:
"
blur
"
}],
content
:
[{
required
:
true
,
message
:
"
投诉内容不能为空
"
,
trigger
:
"
blur
"
}],
ascertainReason
:
[{
required
:
true
,
message
:
"
查明原因不能为空
"
,
trigger
:
"
blur
"
}],
result
:
[{
required
:
true
,
message
:
"
处理结果不能为空
"
,
trigger
:
"
blur
"
}],
handleAt
:
[{
required
:
true
,
message
:
"
处理时间不能为空
"
,
trigger
:
"
blur
"
}],
},
},
myFollowCustomerList
:
[],
myFollowCustomerList
:
[],
...
@@ -491,13 +488,28 @@ export default {
...
@@ -491,13 +488,28 @@ export default {
/** 提交按钮 */
/** 提交按钮 */
submitForm
()
{
submitForm
()
{
this
.
$refs
[
"
form
"
].
validate
(
valid
=>
{
this
.
$refs
[
"
form
"
].
validate
(
valid
=>
{
console
.
log
(
valid
)
console
.
log
(
this
.
form
.
handleAt
)
if
(
!
valid
)
{
if
(
!
valid
)
{
return
;
return
;
}
}
// 修改的提交
// 修改的提交
if
(
this
.
form
.
id
!=
null
)
{
if
(
this
.
form
.
id
!=
null
)
{
if
(
this
.
form
.
status
==
2
){
if
(
!
this
.
form
.
ascertainReason
){
this
.
$modal
.
msgError
(
"
请输入查明原因
"
);
return
}
}
if
(
this
.
form
.
status
==
3
){
if
(
!
this
.
form
.
result
){
this
.
$modal
.
msgError
(
"
请输入处理结果
"
);
return
}
if
(
!
this
.
form
.
handleAt
){
this
.
$modal
.
msgError
(
"
请输入处理时间
"
);
return
}
}
updateCustomerComplaint
(
this
.
form
).
then
(
response
=>
{
updateCustomerComplaint
(
this
.
form
).
then
(
response
=>
{
this
.
$modal
.
msgSuccess
(
"
修改成功
"
);
this
.
$modal
.
msgSuccess
(
"
修改成功
"
);
this
.
open
=
false
;
this
.
open
=
false
;
...
...
src/views/ecw/offer/edit.vue
View file @
03c70c38
...
@@ -295,13 +295,13 @@
...
@@ -295,13 +295,13 @@
{{fee.insuranceFee || 0}} {{$t('美元')}}
{{fee.insuranceFee || 0}} {{$t('美元')}}
</el-descriptions-item>
</el-descriptions-item>
<el-descriptions-item
:label=
"$t('总运费')"
>
<el-descriptions-item
:label=
"$t('总运费')"
>
<
template
v-for=
"item in
clearance
FeeList"
>
<
template
v-for=
"item in
freight
FeeList"
>
<div
:key=
"item.currencyId"
>
{{
item
.
amount
||
0
}}{{
currencyMap
[
item
.
currencyId
]
}}
</div>
<div
:key=
"item.currencyId"
>
{{
item
.
amount
||
0
}}{{
currencyMap
[
item
.
currencyId
]
}}
</div>
</
template
>
</
template
>
</el-descriptions-item>
</el-descriptions-item>
<!--代收货款,只有非控货订单、并且线路开通了代收货款后,才显示是否代收货款选项-->
<!--代收货款,只有非控货订单、并且线路开通了代收货款后,才显示是否代收货款选项-->
<el-descriptions-item
:label=
"$t('总清关费')"
>
<el-descriptions-item
:label=
"$t('总清关费')"
>
<
template
v-for=
"item in
freight
FeeList"
>
<
template
v-for=
"item in
clearance
FeeList"
>
<div
:key=
"item.currencyId"
>
{{
item
.
amount
||
0
}}{{
currencyMap
[
item
.
currencyId
]
}}
</div>
<div
:key=
"item.currencyId"
>
{{
item
.
amount
||
0
}}{{
currencyMap
[
item
.
currencyId
]
}}
</div>
</
template
>
</
template
>
</el-descriptions-item>
</el-descriptions-item>
...
@@ -724,7 +724,7 @@ export default {
...
@@ -724,7 +724,7 @@ export default {
if
(
this
.
$route
.
query
.
id
){
if
(
this
.
$route
.
query
.
id
){
this
.
getOffer
()
this
.
getOffer
()
}
//
else this.addProduct()
}
else
this
.
addProduct
()
},
},
methods
:
{
methods
:
{
getOffer
(){
getOffer
(){
...
@@ -799,10 +799,6 @@ export default {
...
@@ -799,10 +799,6 @@ export default {
this
.
calculationPrice
()
this
.
calculationPrice
()
},
},
addProduct
(
data
){
addProduct
(
data
){
if
(
!
data
&&
!
this
.
form
.
lineId
){
return
this
.
$message
.
error
(
this
.
$t
(
'
请先选择路线
'
))
}
console
.
log
(
'
addProduct
'
,
JSON
.
stringify
(
data
))
this
.
form
.
prodCreateReqVOList
.
push
(
data
||
{
prodAttrArr
:[]})
this
.
form
.
prodCreateReqVOList
.
push
(
data
||
{
prodAttrArr
:[]})
},
},
// 计算商品运费
// 计算商品运费
...
@@ -850,8 +846,19 @@ export default {
...
@@ -850,8 +846,19 @@ export default {
},
},
/** 提交按钮 */
/** 提交按钮 */
submitForm
(
status
)
{
submitForm
(
status
)
{
this
.
$refs
[
"
form
"
].
validate
(
valid
=>
{
this
.
$refs
[
"
form
"
].
validate
((
valid
,
errors
)
=>
{
console
.
log
({
valid
,
errors
})
if
(
!
valid
)
{
if
(
!
valid
)
{
return
this
.
$showFormValidateErrors
(
errors
);
/* let h = this.$createElement
this.$notify({
'title': '表单错误',
type: 'warning',
message: h('div', [
h('div', '请填写某某'),
h('div', '水电费水电费')
])
}) */
return
;
return
;
}
}
...
...
src/views/ecw/order/components/PrintWarehouseReceipt.vue
View file @
03c70c38
...
@@ -5,7 +5,7 @@
...
@@ -5,7 +5,7 @@
<div
id=
"myproa"
>
<div
id=
"myproa"
>
<p
style=
"padding-bottom:10px;font-size:16px;"
>
<p
style=
"padding-bottom:10px;font-size:16px;"
>
{{
$t
(
'
订单号
'
)
}}
:
{{
detail
.
orderNo
}}
{{
$t
(
'
订单号
'
)
}}
:
{{
detail
.
orderNo
}}
{{
$t
(
'
发货人电话
'
)
}}
:
{{
detail
.
name
}}
{{
detail
.
phone
}}
{{
$t
(
'
发货人电话
'
)
}}
:
{{
detail
.
consignorVO
.
countryCode
}}
{{
detail
.
consignorVO
.
phone
}}
{{
$t
(
'
提货地点
'
)
}}
:
{{
objective
.
titleZh
}}
{{
$t
(
'
提货地点
'
)
}}
:
{{
objective
.
titleZh
}}
<img
:src=
"qrcode"
style=
"margin-left: 10px;width:17mm;vertical-align:middle"
/>
<img
:src=
"qrcode"
style=
"margin-left: 10px;width:17mm;vertical-align:middle"
/>
</p>
</p>
...
@@ -33,7 +33,7 @@
...
@@ -33,7 +33,7 @@
</label>
</label>
</td>
</td>
<td
style=
"text-align:center;padding:0 0px;border:1px dashed #ccc;"
>
<td
style=
"text-align:center;padding:0 0px;border:1px dashed #ccc;"
>
{{
item
.
marks
}}
{{
detail
.
marks
}}
</td>
</td>
<td
style=
"text-align:center;padding:0 0px;border:1px dashed #ccc;"
>
<td
style=
"text-align:center;padding:0 0px;border:1px dashed #ccc;"
>
{{
item
.
prodTitleZh
}}
<br/>
{{
item
.
prodTitleEn
}}
{{
item
.
prodTitleZh
}}
<br/>
{{
item
.
prodTitleEn
}}
...
...
src/views/ecw/order/create.vue
0 → 100644
View file @
03c70c38
<
script
>
// 对edit组件复用并更名,防止keepalive缓存数据
import
edit
from
'
./edit.vue
'
edit
.
name
=
'
OrderCreate
'
export
default
edit
</
script
>
\ No newline at end of file
src/views/ecw/order/edit.vue
View file @
03c70c38
...
@@ -360,12 +360,11 @@
...
@@ -360,12 +360,11 @@
</div>
</div>
</div>
</div>
<div>
<div>
<el-form-item
:label=
"$t('预计送货日期')"
prop=
"deliveryDate"
class=
"ml-20"
>
<el-form-item
:label=
"$t('预计送货日期')"
prop=
"deliveryDate"
>
<el-date-picker
v-model=
"form.deliveryDate"
value-format=
"yyyy-MM-dd HH:mm:ss"
></el-date-picker>
<el-date-picker
v-model=
"form.deliveryDate"
value-format=
"yyyy-MM-dd HH:mm:ss"
></el-date-picker>
</el-form-item>
</el-form-item>
</div>
</div>
<div>
<div>
<el-form-item
:label=
"$t('收货方式')"
prop=
"harvestMethod"
class=
"ml-20"
>
<el-form-item
:label=
"$t('收货方式')"
prop=
"harvestMethod"
class=
"ml-20"
>
<dict-selector
:type=
"DICT_TYPE.ECW_HARVEST_METHOD"
v-model=
"form.harvestMethod"
:filter=
"item => item.value == 1 || homeDeliveryService"
defaultable
/>
<dict-selector
:type=
"DICT_TYPE.ECW_HARVEST_METHOD"
v-model=
"form.harvestMethod"
:filter=
"item => item.value == 1 || homeDeliveryService"
defaultable
/>
</el-form-item>
</el-form-item>
...
@@ -407,30 +406,39 @@
...
@@ -407,30 +406,39 @@
<el-button
type=
"primary"
slot=
"append"
@
click=
"getOrderCourierNumber"
>
{{$t('生成单号')}}
</el-button>
<el-button
type=
"primary"
slot=
"append"
@
click=
"getOrderCourierNumber"
>
{{$t('生成单号')}}
</el-button>
</el-input>
</el-input>
</el-form-item>
</el-form-item>
<br/>
<el-form-item
:label=
"$t('是否双清')"
v-if=
"[2,3,4].indexOf(+form.transportId) > -1"
>
<dict-selector
v-model=
"form.doubleClear"
form-type=
"radio"
:type=
"DICT_TYPE.ECW_DOUBLE_CLEAR"
/>
</el-form-item>
<el-form-item
:label=
"$t('航空公司')"
v-if=
"[3,4].indexOf(+form.transportId) > -1"
>
<!--待查询备选数据-->
<el-select
placeholder=
""
v-model=
"form.airlineCompany"
>
</el-select>
</el-form-item>
<el-form-item
:label=
"$t('船公司')"
v-if=
"[2].indexOf(+form.transportId) > -1"
>
<el-select
placeholder=
""
v-model=
"form.shippingCompany"
>
</el-select>
</el-form-item>
<el-form-item
:label=
"$t('清关证书')"
v-if=
"[2,3,4].indexOf(+form.transportId) > -1"
>
<div
v-if=
"[2,3,4].indexOf(+form.transportId) > -1"
>
<dict-selector
v-model=
"form.customsClearCert"
form-type=
"radio"
:type=
"DICT_TYPE.INFRA_BOOLEAN_STRING"
fomatter=
"bool"
/>
<el-form-item
:label=
"$t('是否双清')"
>
</el-form-item>
<dict-selector
v-model=
"form.doubleClear"
form-type=
"radio"
:type=
"DICT_TYPE.ECW_DOUBLE_CLEAR"
/>
<el-form-item
label=
"清关证书备注"
v-if=
"[2,3,4].indexOf(+form.transportId) > -1"
>
</el-form-item>
<el-input
v-model=
"form.remarks"
></el-input>
</div>
</el-form-item>
<el-form-item
label=
"是否拆包"
v-if=
"[3,4].indexOf(+form.transportId) > -1"
>
<div
v-if=
"[3,4].indexOf(+form.transportId) > -1"
>
<dict-selector
v-model=
"form.isUnpack"
form-type=
"radio"
:type=
"DICT_TYPE.INFRA_BOOLEAN_STRING"
fomatter=
"bool"
/>
<el-form-item
:label=
"$t('航空公司')"
>
</el-form-item>
<!--待查询备选数据-->
<el-select
placeholder=
""
v-model=
"form.airlineCompany"
>
</el-select>
</el-form-item>
</div>
<div
v-if=
"[2].indexOf(+form.transportId) > -1"
>
<el-form-item
:label=
"$t('船公司')"
>
<el-select
placeholder=
""
v-model=
"form.shippingCompany"
>
</el-select>
</el-form-item>
</div>
<div
v-if=
"[2,3,4].indexOf(+form.transportId) > -1"
>
<el-form-item
:label=
"$t('清关证书')"
>
<dict-selector
v-model=
"form.customsClearCert"
form-type=
"radio"
:type=
"DICT_TYPE.INFRA_BOOLEAN_STRING"
fomatter=
"bool"
/>
</el-form-item>
<el-form-item
label=
"清关证书备注"
>
<el-input
v-model=
"form.remarks"
></el-input>
</el-form-item>
</div>
<div
v-if=
"[3,4].indexOf(+form.transportId) > -1"
>
<el-form-item
label=
"是否拆包"
>
<dict-selector
v-model=
"form.isUnpack"
form-type=
"radio"
:type=
"DICT_TYPE.INFRA_BOOLEAN_STRING"
fomatter=
"bool"
/>
</el-form-item>
</div>
<div
class=
"form-section"
>
<div
class=
"form-section"
>
<el-form-item
:label=
"$t('单票立刻转运')"
v-if=
"[3,4].indexOf(+form.transportId) > -1"
>
<el-form-item
:label=
"$t('单票立刻转运')"
v-if=
"[3,4].indexOf(+form.transportId) > -1"
>
<dict-selector
v-model=
"form.isSingleTicketTransport"
form-type=
"radio"
:type=
"DICT_TYPE.INFRA_BOOLEAN_STRING"
fomatter=
"bool"
/>
<dict-selector
v-model=
"form.isSingleTicketTransport"
form-type=
"radio"
:type=
"DICT_TYPE.INFRA_BOOLEAN_STRING"
fomatter=
"bool"
/>
...
@@ -513,6 +521,8 @@ import ChooseContactDialog from '@/components/ChooseContactDialog'
...
@@ -513,6 +521,8 @@ import ChooseContactDialog from '@/components/ChooseContactDialog'
import
QuickCreateCustomer
from
'
@/components/QuickCreateCustomer
'
import
QuickCreateCustomer
from
'
@/components/QuickCreateCustomer
'
import
{
calculationPrice
}
from
'
@/api/ecw/product
'
import
{
calculationPrice
}
from
'
@/api/ecw/product
'
// 缓存默认的表单数据
let
defaultFormData
=
null
export
default
{
export
default
{
name
:
"
EcwOrderEdit
"
,
name
:
"
EcwOrderEdit
"
,
...
@@ -716,6 +726,8 @@ export default {
...
@@ -716,6 +726,8 @@ export default {
}
}
},
},
created
()
{
created
()
{
defaultFormData
=
Object
.
assign
({},
this
.
form
)
this
.
couponTypeList
=
this
.
getDictDatas
(
this
.
DICT_TYPE
.
ECW_COUPON_TYPE
)
this
.
couponTypeList
=
this
.
getDictDatas
(
this
.
DICT_TYPE
.
ECW_COUPON_TYPE
)
this
.
couponTypeList
.
forEach
(
item
=>
{
this
.
couponTypeList
.
forEach
(
item
=>
{
this
.
$set
(
this
.
selectedCoupons
,
item
.
value
,
null
)
this
.
$set
(
this
.
selectedCoupons
,
item
.
value
,
null
)
...
@@ -935,6 +947,11 @@ export default {
...
@@ -935,6 +947,11 @@ export default {
// 添加的提交
// 添加的提交
createOrder
(
data
).
then
(
response
=>
{
createOrder
(
data
).
then
(
response
=>
{
this
.
$modal
.
msgSuccess
(
this
.
$t
(
"
新增成功
"
));
this
.
$modal
.
msgSuccess
(
this
.
$t
(
"
新增成功
"
));
// 重置数据
this
.
form
=
{...
defaultFormData
}
this
.
$refs
.
form
.
clearValidate
()
this
.
$redirect
(
'
success?orderId=
'
+
response
.
data
)
this
.
$redirect
(
'
success?orderId=
'
+
response
.
data
)
});
});
});
});
...
...
src/views/ecw/order/exception/index.vue
View file @
03c70c38
...
@@ -147,7 +147,6 @@ import {DICT_TYPE} from '@/utils/dict'
...
@@ -147,7 +147,6 @@ import {DICT_TYPE} from '@/utils/dict'
import
{
userList
}
from
"
@/api/system/user
"
import
{
userList
}
from
"
@/api/system/user
"
import
CustomerSelector
from
'
@/components/CustomerSelector
'
import
CustomerSelector
from
'
@/components/CustomerSelector
'
import
ProductSelector
from
'
@/components/ProductSelector
'
import
ProductSelector
from
'
@/components/ProductSelector
'
import
getProduct
from
'
@/api/ecw/product
'
export
default
{
export
default
{
name
:
"
Exception
"
,
name
:
"
Exception
"
,
...
...
src/views/ecw/order/pending.vue
View file @
03c70c38
...
@@ -106,6 +106,7 @@ import {getExceptionListByOrderId} from "@/api/ecw/orderException"
...
@@ -106,6 +106,7 @@ import {getExceptionListByOrderId} from "@/api/ecw/orderException"
import
{
DICT_TYPE
}
from
'
@/utils/dict
'
import
{
DICT_TYPE
}
from
'
@/utils/dict
'
import
{
getOrder
}
from
'
@/api/ecw/order
'
import
{
getOrder
}
from
'
@/api/ecw/order
'
import
FilePreview
from
'
@/components/FilePreview
'
import
FilePreview
from
'
@/components/FilePreview
'
import
{
getProduct
}
from
'
@/api/ecw/product
'
export
default
{
export
default
{
name
:
"
Pending
"
,
name
:
"
Pending
"
,
...
@@ -158,15 +159,14 @@ export default {
...
@@ -158,15 +159,14 @@ export default {
handEdit
(
row
){
handEdit
(
row
){
if
(
row
.
orderExceptionType
==
'
order_no_quote_exception
'
){
if
(
row
.
orderExceptionType
==
'
order_no_quote_exception
'
){
getProduct
(
row
.
orderItemId
).
then
(
res
=>
{
let
url
=
'
../../lineProject/product-price/edit
'
this
.
$router
.
push
({
name
:
'
ProductPrice
'
,
if
(
row
.
orderItem
){
query
:
{
getProduct
(
row
.
orderItemId
).
then
(
res
=>
{
product_id
:
row
.
orderItemId
,
url
=
'
../../lineProject/product-price/edit?product_id=
'
+
row
.
orderItemId
+
'
&product_type=
'
+
res
.
data
.
typeId
product_type
:
res
.
data
.
typeId
}
})
})
})
}
return
this
.
$router
.
push
(
url
)
}
else
if
(
row
.
orderExceptionType
==
'
order_heavy_cargo_exception
'
||
row
.
orderExceptionType
==
'
order_bulky_cargo_exception
'
){
}
else
if
(
row
.
orderExceptionType
==
'
order_heavy_cargo_exception
'
||
row
.
orderExceptionType
==
'
order_bulky_cargo_exception
'
){
this
.
$router
.
push
({
this
.
$router
.
push
({
path
:
"
/order/weightDeal?id=
"
+
row
.
id
+
'
&type=
'
+
row
.
orderExceptionType
,
path
:
"
/order/weightDeal?id=
"
+
row
.
id
+
'
&type=
'
+
row
.
orderExceptionType
,
...
...
src/views/system/internalMessage/index.vue
View file @
03c70c38
...
@@ -45,7 +45,7 @@
...
@@ -45,7 +45,7 @@
<!-- 列表 -->
<!-- 列表 -->
<el-table
v-loading=
"loading"
:data=
"list"
>
<el-table
v-loading=
"loading"
:data=
"list"
>
<el-table-column
label=
""
align=
"center"
prop=
"id"
/>
<el-table-column
label=
""
align=
"center"
prop=
"id"
/>
<!--
<el-table-column
label=
"来源"
align=
"center"
prop=
"fromId"
/>
--
>
<el-table-column
label=
"来源"
align=
"center"
prop=
"fromId"
/
>
<el-table-column
label=
"发送时间"
align=
"center"
prop=
"sendTime"
width=
"180"
>
<el-table-column
label=
"发送时间"
align=
"center"
prop=
"sendTime"
width=
"180"
>
<template
slot-scope=
"scope"
>
<template
slot-scope=
"scope"
>
<span>
{{
parseTime
(
scope
.
row
.
sendTime
)
}}
</span>
<span>
{{
parseTime
(
scope
.
row
.
sendTime
)
}}
</span>
...
@@ -58,11 +58,11 @@
...
@@ -58,11 +58,11 @@
<dict-tag
:type=
"DICT_TYPE.INTERNAL_MESSAGE_TYPE"
:value=
"scope.row.type"
/>
<dict-tag
:type=
"DICT_TYPE.INTERNAL_MESSAGE_TYPE"
:value=
"scope.row.type"
/>
</
template
>
</
template
>
</el-table-column>
</el-table-column>
<!-- <el-table-column label="创建时间" align="center" prop="createTime" width="180">--
>
<el-table-column
label=
"创建时间"
align=
"center"
prop=
"createTime"
width=
"180"
>
<!-- <template slot-scope="scope">--
>
<
template
slot-scope=
"scope"
>
<!-- <span>{{ parseTime(scope.row.createTime) }}</span>--
>
<span>
{{
parseTime
(
scope
.
row
.
createTime
)
}}
</span
>
<!-- </template>--
>
</
template
>
<!-- </el-table-column>--
>
</el-table-column
>
<el-table-column
label=
"操作"
align=
"center"
class-name=
"small-padding fixed-width"
>
<el-table-column
label=
"操作"
align=
"center"
class-name=
"small-padding fixed-width"
>
<
template
slot-scope=
"scope"
>
<
template
slot-scope=
"scope"
>
<el-button
size=
"mini"
type=
"text"
icon=
"el-icon-edit"
@
click=
"handleUpdate(scope.row)"
<el-button
size=
"mini"
type=
"text"
icon=
"el-icon-edit"
@
click=
"handleUpdate(scope.row)"
...
@@ -79,9 +79,9 @@
...
@@ -79,9 +79,9 @@
<!-- 对话框(添加 / 修改) -->
<!-- 对话框(添加 / 修改) -->
<el-dialog
:title=
"title"
:visible.sync=
"open"
width=
"500px"
append-to-body
>
<el-dialog
:title=
"title"
:visible.sync=
"open"
width=
"500px"
append-to-body
>
<el-form
ref=
"form"
:model=
"form"
:rules=
"rules"
label-width=
"80px"
>
<el-form
ref=
"form"
:model=
"form"
:rules=
"rules"
label-width=
"80px"
>
<!-- <el-form-item label="来源" prop="fromId">--
>
<el-form-item
label=
"来源"
prop=
"fromId"
>
<!-- <el-input v-model="form.fromId" placeholder="请输入站内信来源" />--
>
<el-input
v-model=
"form.fromId"
placeholder=
"请输入站内信来源"
/
>
<!-- </el-form-item>--
>
</el-form-item
>
<el-form-item
label=
"发送时间"
prop=
"sendTime"
>
<el-form-item
label=
"发送时间"
prop=
"sendTime"
>
<el-date-picker
clearable
v-model=
"form.sendTime"
type=
"date"
value-format=
"yyyy-MM-dd"
placeholder=
"选择发送时间"
/>
<el-date-picker
clearable
v-model=
"form.sendTime"
type=
"date"
value-format=
"yyyy-MM-dd"
placeholder=
"选择发送时间"
/>
</el-form-item>
</el-form-item>
...
...
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