Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
J
jiedao-web-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
1
Merge Requests
1
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-web-master
Commits
e481cbd2
Commit
e481cbd2
authored
Jan 20, 2025
by
Smile
Committed by
wux
Feb 06, 2025
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
任务88:客户端改造,页面屏蔽我要发货,屏蔽去处理,复制,申请退仓,修改按钮
parent
be654c89
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
24 additions
and
8 deletions
+24
-8
index.vue
src/layout/components/JdSidebar/index.vue
+8
-1
index.vue
src/views/jiedao/profile/index.vue
+1
-1
postorder.vue
src/views/jiedao/profile/postorder.vue
+14
-5
receivedorder.vue
src/views/jiedao/profile/receivedorder.vue
+1
-1
No files found.
src/layout/components/JdSidebar/index.vue
View file @
e481cbd2
...
...
@@ -397,7 +397,7 @@
>
</div>
</div>
<jd-button
<jd-button
v-if=
"isDelivery"
style=
"margin: 16px auto; width: 160px"
:name=
"$t('sidebar.delivery')"
@
click.native=
"transVisble = true"
...
...
@@ -1026,6 +1026,7 @@ export default {
components
:
{
JdButton
,
DictTag
},
data
()
{
return
{
isDelivery
:
false
,
check
:
false
,
action
:
""
,
showMyOrder
:
true
,
...
...
@@ -1054,6 +1055,7 @@ export default {
this
.
getMemberSystemStatus
();
this
.
action
=
this
.
$route
.
name
;
this
.
userInfo
=
this
.
loginUser
;
this
.
isForeignUser
()
getMark
().
then
((
r
)
=>
{
this
.
mark
=
r
.
data
;
});
...
...
@@ -1065,6 +1067,11 @@ export default {
});
},
methods
:
{
isForeignUser
(){
if
(
this
.
loginUser
!=
null
){
this
.
isDelivery
=
this
.
loginUser
.
areaCode
===
'
86
'
;
}
},
onLanguageChange
(
newVal
,
oldVal
)
{
if
(
newVal
!==
oldVal
)
{
this
.
getInfo
();
...
...
src/views/jiedao/profile/index.vue
View file @
e481cbd2
...
...
@@ -17,7 +17,7 @@
<!-- 搜索工作栏 -->
<el-form
v-show=
"showSearch"
ref=
"queryForm"
:model=
"queryParams"
size=
"small"
:inline=
"true"
style=
"margin-top: 20px;"
>
<el-form-item
:label=
"$t('controlorder.No')"
prop=
"searchKey"
>
<el-input
v-model=
"queryParams.searchKey"
style=
"width: 230px;"
:placeholder=
"$t('controlorder.NoRules')"
<el-input
v-model=
"queryParams.searchKey"
onkeyup=
"this.value=this.value.replace(/\s+/g, '')"
style=
"width: 230px;"
:placeholder=
"$t('controlorder.NoRules')"
clearable
/>
</el-form-item>
<el-form-item
:label=
"$t('postorder.status')"
prop=
"dynamicStatusList"
>
...
...
src/views/jiedao/profile/postorder.vue
View file @
e481cbd2
...
...
@@ -37,7 +37,7 @@
</el-col>
<el-col
:span=
"8"
>
<el-form-item
:label=
"$t('controlorder.No')"
prop=
"searchKey"
>
<el-input
v-model=
"queryParams.searchKey"
style=
"width: 230px;"
:placeholder=
"$t('controlorder.NoRules')"
clearable
/>
<el-input
v-model=
"queryParams.searchKey"
onkeyup=
"this.value=this.value.replace(/\s+/g, '')"
style=
"width: 230px;"
:placeholder=
"$t('controlorder.NoRules')"
clearable
/>
</el-form-item>
</el-col>
<el-col
:span=
"8"
>
...
...
@@ -135,10 +135,10 @@
header-align=
"center"
>
<
template
slot-scope=
"scope"
>
<el-button
v-if=
"scope.row.status
<
=
2
"
size=
"mini"
type=
"text"
icon=
"el-icon-edit"
@
click=
"handleUpdate(scope.row, false)"
>
{{
$t
(
'
postorder.edit
'
)
}}
</el-button>
<el-button
v-if=
"scope.row.status
<
=
2
&&
isDelivery
"
size=
"mini"
type=
"text"
icon=
"el-icon-edit"
@
click=
"handleUpdate(scope.row, false)"
>
{{
$t
(
'
postorder.edit
'
)
}}
</el-button>
<el-button
v-if=
"scope.row.status == 2"
size=
"mini"
type=
"text"
icon=
"el-icon-delete"
@
click=
"oprateOrder(scope.row.orderId)"
>
{{
$t
(
'
postorder.cancel
'
)
}}
</el-button>
<el-button
v-if=
"scope.row.status == 5"
size=
"mini"
type=
"text"
icon=
"el-icon-edit"
@
click=
"refundWarehouse(scope.row)"
>
{{
$t
(
'
postorder.refundWarehouse
'
)
}}
</el-button>
<el-button
v-if=
"scope.row.abnormalState>1&&scope.row.status!=88"
size=
"mini"
type=
"text"
icon=
"el-icon-edit"
@
click=
"handleAbnormal(scope.row.orderId)"
>
{{
$t
(
'
postorder.abnormal
'
)
}}
</el-button>
<el-button
v-if=
"scope.row.status == 5
&& isDelivery
"
size=
"mini"
type=
"text"
icon=
"el-icon-edit"
@
click=
"refundWarehouse(scope.row)"
>
{{
$t
(
'
postorder.refundWarehouse
'
)
}}
</el-button>
<el-button
v-if=
"scope.row.abnormalState>1&&scope.row.status!=88
&& isDelivery
"
size=
"mini"
type=
"text"
icon=
"el-icon-edit"
@
click=
"handleAbnormal(scope.row.orderId)"
>
{{
$t
(
'
postorder.abnormal
'
)
}}
</el-button>
<el-button
v-if=
"scope.row.status == 0"
size=
"mini"
type=
"text"
icon=
"el-icon-delete"
@
click=
"handleDelete(scope.row.orderId)"
>
{{
$t
(
'
postorder.delete
'
)
}}
</el-button>
<el-button
v-if=
"scope.row.customsType == 2"
size=
"mini"
type=
"text"
icon=
"el-icon-edit"
@
click.native=
"declarationOrderId=scope.row.orderId;declarationOrderNo=scope.row.orderNo"
>
{{
$t
(
'
common.uploadDeclaration
'
)
}}
</el-button>
<el-button
...
...
@@ -152,7 +152,7 @@
@
click.native=
"printTagOrderId=scope.row.orderId"
>
{{
$t
(
'
打印标签
'
)
}}
</el-button>
<el-button
size=
"mini"
type=
"text"
icon=
"el-icon-edit"
@
click=
"handleCopy(scope.row)"
>
{{
$t
(
'
postorder.copy
'
)
}}
</el-button>
<el-button
size=
"mini"
type=
"text"
v-if=
"isDelivery"
icon=
"el-icon-edit"
@
click=
"handleCopy(scope.row)"
>
{{
$t
(
'
postorder.copy
'
)
}}
</el-button>
</
template
>
</el-table-column>
</el-table>
...
...
@@ -212,6 +212,7 @@
<
script
>
import
{
getIssued
,
cancelOrder
,
deleteOrder
,
refundWarehouseApply
,
copyOrder
}
from
'
@/api/order
'
import
{
parseTime
}
from
'
@/utils
'
import
{
mapGetters
}
from
"
vuex
"
;
import
RightToolbar
from
'
@/components/RightToolbar
'
import
Pagination
from
'
@/components/Pagination
'
import
DictTag
from
'
@/components/DictTag
'
...
...
@@ -234,6 +235,7 @@ export default {
orderList
:
[],
// 显示搜索条件
showSearch
:
true
,
isDelivery
:
false
,
dateFilterType
:
''
,
// 日期筛选类别
dynamicStatusList
:
''
,
// 状态筛选类别
dateFilter
:
[],
// 筛选日期
...
...
@@ -255,6 +257,7 @@ export default {
}
},
computed
:
{
...
mapGetters
([
"
loginUser
"
]),
// expoerCityList() {
// return this.tradeCityList.filter(item => item.type == 2)
// },
...
...
@@ -288,8 +291,14 @@ export default {
},
created
()
{
this
.
getList
()
this
.
isForeignUser
()
},
methods
:
{
isForeignUser
(){
if
(
this
.
loginUser
!=
null
){
this
.
isDelivery
=
this
.
loginUser
.
areaCode
===
'
86
'
;
}
},
getStatusName
:
function
(
item
)
{
const
orderStatus
=
this
.
getRealStatus
(
item
);
const
special
=
this
.
getDictDatas
(
this
.
DICT_TYPE
.
APP_ORDER_STATUS
);
...
...
src/views/jiedao/profile/receivedorder.vue
View file @
e481cbd2
...
...
@@ -37,7 +37,7 @@
</el-col>
<el-col
:span=
"8"
>
<el-form-item
:label=
"$t('controlorder.No')"
prop=
"searchKey"
>
<el-input
v-model=
"queryParams.searchKey"
style=
"width: 230px;"
:placeholder=
"$t('controlorder.NoRules')"
clearable
/>
<el-input
v-model=
"queryParams.searchKey"
onkeyup=
"this.value=this.value.replace(/\s+/g, '')"
style=
"width: 230px;"
:placeholder=
"$t('controlorder.NoRules')"
clearable
/>
</el-form-item>
</el-col>
<el-col
:span=
"8"
>
...
...
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