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
25d4f04e
Commit
25d4f04e
authored
May 28, 2023
by
dragondean@qq.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
空运变更渠道
parent
65f3058a
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
51 additions
and
23 deletions
+51
-23
edit.vue
src/views/ecw/order/edit.vue
+37
-20
index.vue
src/views/ecw/order/index.vue
+14
-3
No files found.
src/views/ecw/order/edit.vue
View file @
25d4f04e
<
template
>
<
template
>
<div
class=
"app-container"
>
<div
class=
"app-container"
>
<el-form
ref=
"form"
:model=
"form"
:rules=
"rules"
label-position=
"left"
inline
>
<el-form
ref=
"form"
:model=
"form"
:rules=
"rules"
label-position=
"left"
inline
:disabled=
"updateChannel"
>
<el-card
v-if=
"form.applyStatus == 1"
class=
"mb-10"
>
<el-card
v-if=
"form.applyStatus == 1"
class=
"mb-10"
>
<div
slot=
"header"
class=
"card-title"
>
{{
$t
(
'
以下信息修改审核中
'
)
}}
</div>
<div
slot=
"header"
class=
"card-title"
>
{{
$t
(
'
以下信息修改审核中
'
)
}}
</div>
<el-table
:data=
"form.applyInfoList"
>
<el-table
:data=
"form.applyInfoList"
>
...
@@ -26,8 +26,8 @@
...
@@ -26,8 +26,8 @@
<!--
<customer-contact-selector
v-model=
"form.consignorContactsId"
@
change=
"consignorContact = $event"
type=
"1"
/>
-->
<!--
<customer-contact-selector
v-model=
"form.consignorContactsId"
@
change=
"consignorContact = $event"
type=
"1"
/>
-->
<div
class=
"contact"
>
<div
class=
"contact"
>
<el-input
v-model=
"form.consignorName"
placeholder=
""
:disabled2=
"inWarehouse"
/>
<el-input
v-model=
"form.consignorName"
placeholder=
""
:disabled2=
"inWarehouse"
/>
<img
src=
"@/assets/images/phonebook.png"
class=
"phonebook"
@
click=
"contactChooseType='consignor'"
/>
<img
v-if=
"!updateChannel"
src=
"@/assets/images/phonebook.png"
class=
"phonebook"
@
click=
"contactChooseType='consignor'"
/>
<img
src=
"@/assets/images/new_customer.png"
class=
"phonebook"
@
click=
"quickCreateType='0'"
/>
<img
v-if=
"!updateChannel"
src=
"@/assets/images/new_customer.png"
class=
"phonebook"
@
click=
"quickCreateType='0'"
/>
</div>
</div>
</el-form-item>
</el-form-item>
<!-- v1.7新增 -->
<!-- v1.7新增 -->
...
@@ -57,8 +57,8 @@
...
@@ -57,8 +57,8 @@
<!--
<customer-contact-selector
v-model=
"form.consignorContactsId"
@
change=
"consignorContact = $event"
type=
"1"
/>
-->
<!--
<customer-contact-selector
v-model=
"form.consignorContactsId"
@
change=
"consignorContact = $event"
type=
"1"
/>
-->
<div
class=
"contact"
>
<div
class=
"contact"
>
<el-input
v-model=
"form.consigneeName"
placeholder=
""
:disabled2=
"inWarehouse"
/>
<el-input
v-model=
"form.consigneeName"
placeholder=
""
:disabled2=
"inWarehouse"
/>
<img
src=
"@/assets/images/phonebook.png"
class=
"phonebook"
@
click=
"contactChooseType='consignee'"
/>
<img
v-if=
"!updateChannel"
src=
"@/assets/images/phonebook.png"
class=
"phonebook"
@
click=
"contactChooseType='consignee'"
/>
<img
src=
"@/assets/images/new_customer.png"
class=
"phonebook"
@
click=
"quickCreateType='1'"
/>
<img
v-if=
"!updateChannel"
src=
"@/assets/images/new_customer.png"
class=
"phonebook"
@
click=
"quickCreateType='1'"
/>
</div>
</div>
</el-form-item>
</el-form-item>
<!-- v1.7新增 -->
<!-- v1.7新增 -->
...
@@ -89,18 +89,20 @@
...
@@ -89,18 +89,20 @@
</el-form-item>
</el-form-item>
<el-form-item
:label=
"$t('出货渠道')"
prop=
"channelId"
v-if=
"getDictData(DICT_TYPE.ECW_TRANSPORT_TYPE, form.transportId).cssClass == 'channel'"
>
<el-form-item
:label=
"$t('出货渠道')"
prop=
"channelId"
v-if=
"getDictData(DICT_TYPE.ECW_TRANSPORT_TYPE, form.transportId).cssClass == 'channel'"
>
<!--嵌套一个form来脱离disabled控制-->
<el-form>
<selector
<selector
:disabled2=
"inWarehouse || getDictData(DICT_TYPE.ECW_TRANSPORT_TYPE, form.transportId).cssClass != 'channel'"
v-model=
"form.channelId"
v-model=
"form.channelId"
:options=
"channelList"
:options=
"channelList"
value-field=
"channelId"
value-field=
"channelId"
:label-field=
"$l(null, 'name')"
:label-field=
"$l(null, 'name')"
></selector>
></selector>
</el-form>
</el-form-item>
</el-form-item>
</div>
</div>
<div
class=
"form-section"
>
<div
class=
"form-section"
>
<el-form-item
:label=
"$t('始发城市')"
prop=
"departureId"
>
<el-form-item
:label=
"$t('始发城市')"
prop=
"departureId"
:disabled=
"false"
>
<el-select
v-model=
"form.departureId"
:placeholder=
"$t('请选择始发地')"
:disabled
2=
"inWarehou
se"
>
<el-select
v-model=
"form.departureId"
:placeholder=
"$t('请选择始发地')"
:disabled
=
"fal
se"
>
<el-option
v-for=
"item in exportCityList"
:label=
"$l(item, 'title')"
:value=
"item.id"
:key=
"item.id"
></el-option>
<el-option
v-for=
"item in exportCityList"
:label=
"$l(item, 'title')"
:value=
"item.id"
:key=
"item.id"
></el-option>
</el-select>
</el-select>
</el-form-item>
</el-form-item>
...
@@ -114,7 +116,8 @@
...
@@ -114,7 +116,8 @@
<el-form-item
:label=
"$t('选择线路')"
prop=
"lineId"
>
<el-form-item
:label=
"$t('选择线路')"
prop=
"lineId"
>
<el-input
:value=
"selectedRouter ? $l(selectedRouter, 'startTitle') + ' > ' + $l(selectedRouter, 'destTitle') : ''"
disabled
:placeholder=
"$t('请在右侧选择线路')"
></el-input>
<el-input
:value=
"selectedRouter ? $l(selectedRouter, 'startTitle') + ' > ' + $l(selectedRouter, 'destTitle') : ''"
disabled
:placeholder=
"$t('请在右侧选择线路')"
></el-input>
</el-form-item>
</el-form-item>
<select
size=
"5"
v-model=
"form.lineId"
style=
"min-width: 300px; border:1px solid #DCDFE6; border-radius:4px"
:disabled2=
"inWarehouse"
>
<!--select是原生组件,不受el-form的disabled控制-->
<select
size=
"5"
v-model=
"form.lineId"
style=
"min-width: 300px; border:1px solid #DCDFE6; border-radius:4px"
>
<option
v-for=
"item in routerList"
:value=
"item.id"
:key=
"item.id"
>
<option
v-for=
"item in routerList"
:value=
"item.id"
:key=
"item.id"
>
{{
$l
(
item
,
'
startTitle
'
)
}}
>>
{{
$l
(
item
,
'
destTitle
'
)
}}
{{
$l
(
item
,
'
startTitle
'
)
}}
>>
{{
$l
(
item
,
'
destTitle
'
)
}}
(
<dict-tag
:type=
"DICT_TYPE.ECW_TRANSPORT_TYPE"
:value=
"item.transportType"
></dict-tag>
)
(
<dict-tag
:type=
"DICT_TYPE.ECW_TRANSPORT_TYPE"
:value=
"item.transportType"
></dict-tag>
)
...
@@ -144,8 +147,8 @@
...
@@ -144,8 +147,8 @@
<el-card
class=
"mt-10"
>
<el-card
class=
"mt-10"
>
<div
slot=
"header"
class=
"card-title"
>
<div
slot=
"header"
class=
"card-title"
>
<div
class=
"card-name"
>
{{
$t
(
'
商品信息
'
)
}}
</div>
<div
class=
"card-name"
>
{{
$t
(
'
商品信息
'
)
}}
</div>
<el-button
type=
"primary"
size=
"mini"
@
click=
"addProduct(null)"
:disabled=
"!canAddProduct || !productEditable"
>
{{
$t
(
'
添加货物
'
)
}}
</el-button>
<el-button
type=
"primary"
size=
"mini"
@
click=
"addProduct(null)"
:disabled=
"!canAddProduct || !productEditable
|| updateChannel
"
>
{{
$t
(
'
添加货物
'
)
}}
</el-button>
<el-button
type=
"primary"
size=
"mini"
@
click=
"showBatchImportDialog=true"
:disabled=
"!canAddProduct || !productEditable"
>
{{
$t
(
'
批量添加货物
'
)
}}
</el-button>
<el-button
type=
"primary"
size=
"mini"
@
click=
"showBatchImportDialog=true"
:disabled=
"!canAddProduct || !productEditable
|| updateChannel
"
>
{{
$t
(
'
批量添加货物
'
)
}}
</el-button>
</div>
</div>
<el-table
:data=
"form.orderItemVOList"
border
class=
"product-list"
v-if=
"!initing"
>
<el-table
:data=
"form.orderItemVOList"
border
class=
"product-list"
v-if=
"!initing"
>
<el-table-column
:label=
"$t('序号')"
width=
"60px"
fixed
>
<el-table-column
:label=
"$t('序号')"
width=
"60px"
fixed
>
...
@@ -297,7 +300,7 @@
...
@@ -297,7 +300,7 @@
</el-table-column>
</el-table-column>
<el-table-column
:label=
"$t('操作')"
width=
"80px"
fixed=
"right"
>
<el-table-column
:label=
"$t('操作')"
width=
"80px"
fixed=
"right"
>
<
template
slot-scope=
"scope"
>
<
template
slot-scope=
"scope"
>
<el-button
size=
"mini"
type=
"danger"
@
click=
"delProduct(scope.$index)"
:disabled=
"!productEditable"
>
{{
$t
(
'
删除
'
)
}}
</el-button>
<el-button
size=
"mini"
type=
"danger"
@
click=
"delProduct(scope.$index)"
:disabled=
"!productEditable
|| updateChannel
"
>
{{
$t
(
'
删除
'
)
}}
</el-button>
</
template
>
</
template
>
</el-table-column>
</el-table-column>
...
@@ -494,7 +497,7 @@
...
@@ -494,7 +497,7 @@
<work-flow
xmlkey=
"order_modify"
v-model=
"ccIdArr"
/>
<work-flow
xmlkey=
"order_modify"
v-model=
"ccIdArr"
/>
</el-card>
</el-card>
<el-form
-item
label=
""
style=
"margin: 30px 0"
>
<el-form
label=
""
style=
"margin: 30px 0"
>
<
template
v-if=
"form.applyStatus == 1"
>
<
template
v-if=
"form.applyStatus == 1"
>
<el-button
type=
"primary"
@
click=
"$router.push('/bpm/process-instance/detail?id=' + form.formId)"
>
{{
$t
(
'
审核中
'
)
}}
</el-button>
<el-button
type=
"primary"
@
click=
"$router.push('/bpm/process-instance/detail?id=' + form.formId)"
>
{{
$t
(
'
审核中
'
)
}}
</el-button>
</
template
>
</
template
>
...
@@ -504,7 +507,7 @@
...
@@ -504,7 +507,7 @@
<el-button
type=
"primary"
@
click=
"submitForm(2)"
v-else
>
{{
$t
(
'
编辑订单
'
)
}}
</el-button>
<!--修改-->
<el-button
type=
"primary"
@
click=
"submitForm(2)"
v-else
>
{{
$t
(
'
编辑订单
'
)
}}
</el-button>
<!--修改-->
</
template
>
</
template
>
<el-button
@
click=
"$store.dispatch('tagsView/delCurrentView')"
>
{{$t('返回')}}
</el-button>
<el-button
@
click=
"$store.dispatch('tagsView/delCurrentView')"
>
{{$t('返回')}}
</el-button>
</el-form
-item
>
</el-form>
</el-form>
</el-form>
<el-dialog
:title=
"$t('批量导入')"
:visible.sync=
"showBatchImportDialog"
width=
"1000px"
:close-on-click-modal=
"false"
>
<el-dialog
:title=
"$t('批量导入')"
:visible.sync=
"showBatchImportDialog"
width=
"1000px"
:close-on-click-modal=
"false"
>
...
@@ -637,7 +640,8 @@ export default {
...
@@ -637,7 +640,8 @@ export default {
quickCreateType
:
null
,
// 快速新建客户类型,1发货人,2收货人
quickCreateType
:
null
,
// 快速新建客户类型,1发货人,2收货人
showWorkFlow
:
false
,
// 是否显示工作流表单
showWorkFlow
:
false
,
// 是否显示工作流表单
calculating
:
false
,
// 是否正在计算费用,防止频繁重新请求
calculating
:
false
,
// 是否正在计算费用,防止频繁重新请求
initing
:
true
,
// 初始化中
initing
:
true
,
// 初始化中,
updateChannel
:
false
// 是否更新渠道
};
};
},
},
computed
:{
computed
:{
...
@@ -921,6 +925,12 @@ export default {
...
@@ -921,6 +925,12 @@ export default {
if
(
!
enable
&&
this
.
form
.
harvestMethod
!=
1
){
if
(
!
enable
&&
this
.
form
.
harvestMethod
!=
1
){
this
.
form
.
harvestMethod
=
1
this
.
form
.
harvestMethod
=
1
}
}
},
// 变更渠道需要显示工作流组件
updateChannel
(
updateChannel
){
if
(
updateChannel
){
this
.
$set
(
this
,
'
showWorkFlow
'
,
true
)
}
}
}
},
},
activated
(){
activated
(){
...
@@ -930,6 +940,9 @@ export default {
...
@@ -930,6 +940,9 @@ export default {
if
(
this
.
$route
.
query
.
transportType
!=
this
.
transportId
){
if
(
this
.
$route
.
query
.
transportType
!=
this
.
transportId
){
this
.
set
(
this
.
form
.
transportId
,
+
this
.
$route
.
query
.
transportType
)
this
.
set
(
this
.
form
.
transportId
,
+
this
.
$route
.
query
.
transportType
)
}
}
// 变更出货渠道
this
.
updateChannel
=
this
.
$route
.
query
.
updateChannel
==
1
},
},
async
created
()
{
async
created
()
{
...
@@ -949,6 +962,10 @@ export default {
...
@@ -949,6 +962,10 @@ export default {
if
(
this
.
$route
.
query
.
transportType
){
if
(
this
.
$route
.
query
.
transportType
){
this
.
$set
(
this
.
form
,
'
transportId
'
,
+
this
.
$route
.
query
.
transportType
)
this
.
$set
(
this
.
form
,
'
transportId
'
,
+
this
.
$route
.
query
.
transportType
)
}
}
// 变更出货渠道
if
(
this
.
$route
.
query
.
updateChannel
){
this
.
updateChannel
=
true
}
if
(
this
.
$route
.
query
.
id
){
if
(
this
.
$route
.
query
.
id
){
this
.
getOrder
()
this
.
getOrder
()
}
else
{
}
else
{
...
...
src/views/ecw/order/index.vue
View file @
25d4f04e
...
@@ -335,6 +335,13 @@
...
@@ -335,6 +335,13 @@
<el-dropdown-item
@
click.native=
"showMergedLogOrderNo=scope.row.orderNo"
v-hasPermi=
"['ecw:order:merge_log']"
>
{{
$t
(
'
合单日志
'
)
}}
</el-dropdown-item>
<el-dropdown-item
@
click.native=
"showMergedLogOrderNo=scope.row.orderNo"
v-hasPermi=
"['ecw:order:merge_log']"
>
{{
$t
(
'
合单日志
'
)
}}
</el-dropdown-item>
<el-dropdown-item
@
click.native=
"showPickupLogOrderNo=scope.row.orderNo"
v-hasPermi=
"['ecw:order:split_log']"
>
{{
$t
(
'
提货日志
'
)
}}
</el-dropdown-item>
<el-dropdown-item
@
click.native=
"showPickupLogOrderNo=scope.row.orderNo"
v-hasPermi=
"['ecw:order:split_log']"
>
{{
$t
(
'
提货日志
'
)
}}
</el-dropdown-item>
</
template
>
</
template
>
<!--变更出货渠道-->
<
template
v-if=
"(
scope.row.transportId == 3
)"
>
<el-dropdown-item
@
click.native=
"handleUpdate(scope.row, true)"
v-hasPermi=
"['ecw:order:update_channel']"
>
{{
$t
(
'
变更出货渠道
'
)
}}
</el-dropdown-item>
</
template
>
</el-dropdown-menu>
</el-dropdown-menu>
</el-dropdown>
</el-dropdown>
...
@@ -828,9 +835,13 @@ export default {
...
@@ -828,9 +835,13 @@ export default {
handleAdd
()
{
handleAdd
()
{
this
.
$router
.
push
(
'
create?transportType=
'
+
this
.
transportId
)
this
.
$router
.
push
(
'
create?transportType=
'
+
this
.
transportId
)
},
},
/** 修改按钮操作 */
/** 修改按钮操作, updateChannel表示变更出货渠道 */
handleUpdate
(
row
)
{
handleUpdate
(
row
,
updateChannel
=
false
)
{
this
.
$router
.
push
(
'
edit?id=
'
+
row
.
orderId
)
let
url
=
'
edit?id=
'
+
row
.
orderId
if
(
updateChannel
){
url
+=
"
&updateChannel=1
"
}
this
.
$router
.
push
(
url
)
},
},
/** 导出按钮操作 */
/** 导出按钮操作 */
...
...
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