Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
O
op-web-service
Project
Project
Details
Activity
Releases
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
bp
op-web-service
Commits
9c1a74c7
Commit
9c1a74c7
authored
Aug 10, 2021
by
pengyunqian
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update:下载路径
parent
4892e70b
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
63 additions
and
49 deletions
+63
-49
index.vue
src/pages/Groupmeal/Distrib/index.vue
+63
-49
No files found.
src/pages/Groupmeal/Distrib/index.vue
View file @
9c1a74c7
...
@@ -34,12 +34,12 @@
...
@@ -34,12 +34,12 @@
</el-table-column>
</el-table-column>
<el-table-column
prop=
"prop"
label=
"操作"
width=
"width"
align=
"center"
>
<el-table-column
prop=
"prop"
label=
"操作"
width=
"width"
align=
"center"
>
<
template
#
default=
"scope"
>
<
template
#
default=
"scope"
>
<el-button
type=
"primary"
@
click=
"handleModify(scope.row)"
<el-button
type=
"primary"
@
click=
"handleModify(scope.row)"
>
修改
</el-button
>
修改
</el-button
>
>
<el-button
<el-button
type=
"primary"
type=
"primary"
v-show=
scope.row.url
v-show=
"scope.row.url"
@
click=
"handleDownload(scope.row.url)"
@
click=
"handleDownload(scope.row.url)"
>
下载配送路线
</el-button
>
下载配送路线
</el-button
>
>
...
@@ -48,10 +48,10 @@
...
@@ -48,10 +48,10 @@
</el-table>
</el-table>
<!-- 页码区 -->
<!-- 页码区 -->
<Pagination
<Pagination
@
current-change=
"handleCurrentChange"
@
current-change=
"handleCurrentChange"
v-model:current-page=
"page"
v-model:current-page=
"page"
:page-size=
"pageSize"
:page-size=
"pageSize"
:total=
"total"
:total=
"total"
></Pagination>
></Pagination>
<!-- 添加配送员弹框 -->
<!-- 添加配送员弹框 -->
<el-dialog
<el-dialog
...
@@ -127,7 +127,7 @@
...
@@ -127,7 +127,7 @@
<el-dialog
<el-dialog
title=
"分配配送员"
title=
"分配配送员"
v-model=
"dialogFormAssign"
v-model=
"dialogFormAssign"
width=
"70%"
width=
"70%"
:show-close=
"false"
:show-close=
"false"
>
>
<el-form
class=
"dioFor"
>
<el-form
class=
"dioFor"
>
...
@@ -138,7 +138,12 @@
...
@@ -138,7 +138,12 @@
clearable
clearable
filterable
filterable
>
>
<el-option
:label=
"item.label"
:value=
"item.value"
v-for=
"item in marketingList"
:key=
"item.value"
></el-option>
<el-option
:label=
"item.label"
:value=
"item.value"
v-for=
"item in marketingList"
:key=
"item.value"
></el-option>
</el-select>
</el-select>
</el-form-item>
</el-form-item>
<span
class=
"dioFor"
>
已选:{{ multipleSelection.length }}人
</span>
<span
class=
"dioFor"
>
已选:{{ multipleSelection.length }}人
</span>
...
@@ -153,11 +158,7 @@
...
@@ -153,11 +158,7 @@
style=
"width: 100%"
style=
"width: 100%"
@
selection-change=
"selectGoodsChange"
@
selection-change=
"selectGoodsChange"
>
>
<el-table-column
<el-table-column
width=
"60"
align=
"center"
type=
"selection"
>
width=
"60"
align=
"center"
type=
"selection"
>
</el-table-column>
</el-table-column>
<el-table-column
<el-table-column
align=
"center"
align=
"center"
...
@@ -183,9 +184,9 @@
...
@@ -183,9 +184,9 @@
prop=
"deliverer_tool_type"
prop=
"deliverer_tool_type"
label=
"配送工具"
label=
"配送工具"
>
>
<
template
#
default=
"scope"
>
<
template
#
default=
"scope"
>
{{
scope
.
row
.
deliverer_tool_type
==
0
?
"电动车"
:
"摩托车"
}}
{{
scope
.
row
.
deliverer_tool_type
==
0
?
"电动车"
:
"摩托车"
}}
</
template
>
</
template
>
</el-table-column>
</el-table-column>
</el-table>
</el-table>
</el-form>
</el-form>
...
@@ -207,14 +208,14 @@ import {
...
@@ -207,14 +208,14 @@ import {
getList
,
getList
,
getSaveDeliverer
,
getSaveDeliverer
,
getAddDeliverer
,
getAddDeliverer
,
getMarketingList
getMarketingList
,
}
from
"../../../service/Groupmeal/groupmeal"
;
}
from
"../../../service/Groupmeal/groupmeal"
;
import
{
ElMessage
}
from
"element-plus"
;
import
{
ElMessage
}
from
"element-plus"
;
export
default
{
export
default
{
name
:
"Distrib"
,
name
:
"Distrib"
,
components
:
{
components
:
{
Layout
,
Layout
,
Pagination
Pagination
,
},
},
data
()
{
data
()
{
return
{
return
{
...
@@ -247,13 +248,13 @@ export default {
...
@@ -247,13 +248,13 @@ export default {
page
:
1
,
page
:
1
,
pageSize
:
20
,
pageSize
:
20
,
isEdit
:
false
,
isEdit
:
false
,
marketingList
:
[]
marketingList
:
[],
};
};
},
},
created
()
{
created
()
{
this
.
getList
();
this
.
getList
();
this
.
getDelivererList
();
this
.
getDelivererList
();
this
.
getMarketingList
()
this
.
getMarketingList
()
;
},
},
methods
:
{
methods
:
{
selectGoodsChange
(
val
)
{
selectGoodsChange
(
val
)
{
...
@@ -273,17 +274,17 @@ export default {
...
@@ -273,17 +274,17 @@ export default {
min_capacity
:
""
,
//最小配送量
min_capacity
:
""
,
//最小配送量
tool_type
:
[],
//配送工具
tool_type
:
[],
//配送工具
}),
}),
this
.
deliverer
=
[]
,
(
this
.
deliverer
=
[])
,
this
.
multipleSelection
=
[]
;
(
this
.
multipleSelection
=
[])
;
this
.
selectActivity
=
""
;
//活动下拉框
this
.
selectActivity
=
""
;
//活动下拉框
},
},
// 获取主页列表
// 获取主页列表
async
getList
()
{
async
getList
()
{
const
{
page
,
pageSize
}
=
this
const
{
page
,
pageSize
}
=
this
;
const
params
=
{
const
params
=
{
page
,
page
,
pageSize
pageSize
,
}
}
;
try
{
try
{
const
res
=
await
getList
(
params
);
const
res
=
await
getList
(
params
);
this
.
distribList
=
res
.
response
.
list
;
this
.
distribList
=
res
.
response
.
list
;
...
@@ -297,7 +298,8 @@ export default {
...
@@ -297,7 +298,8 @@ export default {
const
{
name
,
max_capacity
,
min_capacity
,
tool_type
}
=
this
.
addDeliverer
;
const
{
name
,
max_capacity
,
min_capacity
,
tool_type
}
=
this
.
addDeliverer
;
if
(
!
name
)
return
ElMessage
(
"请填写配送员姓名"
);
if
(
!
name
)
return
ElMessage
(
"请填写配送员姓名"
);
if
(
!
max_capacity
)
return
ElMessage
(
"请填写配送上限"
);
if
(
!
max_capacity
)
return
ElMessage
(
"请填写配送上限"
);
if
(
min_capacity
!==
''
&&
min_capacity
<=
0
)
return
ElMessage
(
"最小配送量不能为0或小于0"
);
if
(
min_capacity
!==
""
&&
min_capacity
<=
0
)
return
ElMessage
(
"最小配送量不能为0或小于0"
);
if
(
!
min_capacity
)
return
ElMessage
(
"请填写最小配送量"
);
if
(
!
min_capacity
)
return
ElMessage
(
"请填写最小配送量"
);
if
(
!
tool_type
)
return
ElMessage
(
"请选择配送工具"
);
if
(
!
tool_type
)
return
ElMessage
(
"请选择配送工具"
);
const
params
=
{
const
params
=
{
...
@@ -307,8 +309,8 @@ export default {
...
@@ -307,8 +309,8 @@ export default {
tool_type
:
+
tool_type
,
tool_type
:
+
tool_type
,
};
};
try
{
try
{
const
{
code
,
reason
}
=
await
getAddDeliverer
(
params
);
const
{
code
,
reason
}
=
await
getAddDeliverer
(
params
);
if
(
code
!==
0
)
return
this
.
$message
.
error
(
reason
||
"添加配送员失败"
)
if
(
code
!==
0
)
return
this
.
$message
.
error
(
reason
||
"添加配送员失败"
);
ElMessage
(
"添加配送员成功"
);
ElMessage
(
"添加配送员成功"
);
this
.
getDelivererList
();
this
.
getDelivererList
();
this
.
dialogFormAdd
=
false
;
this
.
dialogFormAdd
=
false
;
...
@@ -323,17 +325,17 @@ export default {
...
@@ -323,17 +325,17 @@ export default {
}
}
},
},
// 添加的取消
// 添加的取消
addCancel
(){
addCancel
()
{
this
.
dialogFormAdd
=
false
this
.
dialogFormAdd
=
false
;
this
.
resetDate
()
this
.
resetDate
()
;
},
},
// 分配配送员
// 分配配送员
assignDeliverer
()
{
assignDeliverer
()
{
this
.
dialogFormAssign
=
true
;
this
.
dialogFormAssign
=
true
;
this
.
getDelivererList
();
this
.
getDelivererList
();
this
.
multipleSelection
=
[];
this
.
multipleSelection
=
[];
this
.
deliverer
=
[]
this
.
deliverer
=
[]
;
this
.
isEdit
=
false
this
.
isEdit
=
false
;
},
},
// 修改
// 修改
async
handleModify
(
row
)
{
async
handleModify
(
row
)
{
...
@@ -342,7 +344,7 @@ export default {
...
@@ -342,7 +344,7 @@ export default {
this
.
selectActivity
=
code
;
this
.
selectActivity
=
code
;
console
.
log
(
code
);
console
.
log
(
code
);
try
{
try
{
const
res
=
await
getDelivererList
({
code
});
const
res
=
await
getDelivererList
({
code
});
this
.
deliverer
=
res
.
response
;
this
.
deliverer
=
res
.
response
;
this
.
isEdit
=
true
;
this
.
isEdit
=
true
;
this
.
getList
();
this
.
getList
();
...
@@ -360,8 +362,14 @@ export default {
...
@@ -360,8 +362,14 @@ export default {
},
},
// 下载路线
// 下载路线
handleDownload
(
url
)
{
handleDownload
(
url
)
{
url
&&
window
.
open
(
"http://bp-dev.ini.yidian-inc.com"
+
url
)
// url && window.open("http://bp-dev.ini.yidian-inc.com" + url);
console
.
log
(
url
)
var
ENV
;
if
(
process
.
env
.
NODE_ENV
==
"development"
)
{
ENV
=
"http://bp-dev.ini.yidian-inc.com/"
;
}
else
{
ENV
=
"http://bp-test.ini.yidian-inc.com/"
;
}
url
&&
window
.
open
(
ENV
+
url
);
},
},
// 分配保存
// 分配保存
async
save
()
{
async
save
()
{
...
@@ -370,9 +378,15 @@ export default {
...
@@ -370,9 +378,15 @@ export default {
if
(
!
selectActivity
)
return
ElMessage
(
"请选择活动姓名"
);
if
(
!
selectActivity
)
return
ElMessage
(
"请选择活动姓名"
);
// if (!uids.length) return this.$message.info("请至少选择一名骑手");
// if (!uids.length) return this.$message.info("请至少选择一名骑手");
try
{
try
{
const
{
code
,
reason
}
=
await
getSaveDeliverer
({
code
:
selectActivity
,
uids
:
uids
.
join
(
","
)
});
const
{
code
,
reason
}
=
await
getSaveDeliverer
({
if
(
code
!==
0
)
return
this
.
$message
.
error
(
reason
||
(
this
.
isEdit
?
"修改配送员失败"
:
"分配配送员失败"
))
code
:
selectActivity
,
ElMessage
(
this
.
isEdit
?
"修改配送员成功"
:
"分配配送员成功"
);
uids
:
uids
.
join
(
","
),
});
if
(
code
!==
0
)
return
this
.
$message
.
error
(
reason
||
(
this
.
isEdit
?
"修改配送员失败"
:
"分配配送员失败"
)
);
ElMessage
(
this
.
isEdit
?
"修改配送员成功"
:
"分配配送员成功"
);
this
.
dialogFormAssign
=
false
;
this
.
dialogFormAssign
=
false
;
this
.
isEdit
=
false
;
this
.
isEdit
=
false
;
this
.
getList
();
this
.
getList
();
...
@@ -382,23 +396,23 @@ export default {
...
@@ -382,23 +396,23 @@ export default {
}
}
},
},
// 分配取消
// 分配取消
assignCancel
(){
assignCancel
()
{
this
.
dialogFormAssign
=
false
this
.
dialogFormAssign
=
false
;
this
.
getDelivererList
()
this
.
getDelivererList
()
;
this
.
resetDate
()
this
.
resetDate
()
;
},
},
// 活动名称列表
// 活动名称列表
async
getMarketingList
()
{
async
getMarketingList
()
{
try
{
try
{
const
res
=
await
getMarketingList
();
const
res
=
await
getMarketingList
();
this
.
marketingList
=
res
.
result
.
map
(
item
=>
{
this
.
marketingList
=
res
.
result
.
map
(
(
item
)
=>
{
return
{
return
{
value
:
item
.
marketing_id
,
value
:
item
.
marketing_id
,
label
:
item
.
marketing_name
label
:
item
.
marketing_name
,
}
}
;
})
})
;
}
catch
(
error
)
{
}
catch
(
error
)
{
console
.
log
(
error
)
console
.
log
(
error
)
;
}
}
},
},
// 分配配送员列表
// 分配配送员列表
...
...
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