Skip to content

N
newShopFront
Commit f246e3c9 authored by Your Name's avatar Your Name
Browse files
Options

配送费配送方式管理快递方式列表

parent b716fbe2
Show whitespace changes
Inline Side-by-side
Showing with 499 additions and 24 deletions
src/api/delivery.js
View file @ f246e3c9
......@@ -15,6 +15,24 @@ import homeUrl from './homeURL'
* @returns {*}
*/
// 获取配送方式列表
export function getDistributionModeList(parameter) {
console.log(parameter)
return axios({
url: 'transport/transport-methods/get-transport-method',
method: 'get',
params: parameter
})
}
// 获取O2O配送费列表
export function getExpressPrice(parameter) {
console.log(parameter)
return axios({
url: 'transport/o2o-deliveries/o2o-delivery-list',
method: 'get',
params: parameter
})
}
// 获取配送价格列表
export function getDeliveryList(parameter) {
return axios({
......
src/config/router.config.js
View file @ f246e3c9
......@@ -195,6 +195,24 @@ export const asyncRouterMap = [
component: PageView,
meta: { title: '配送管理', keepAlive: true, icon: 'dollar', permission: ['table'] },
children: [
{
path: '/delivery/distributionMode',
name: 'distributionMode',
component: () => import('@/views/delivery/distributionMode'),
meta: { title: '快递方式', keepAlive: false, permission: ['table'] }
},
{
path: '/delivery/distributionManage',
name: 'distributionManage',
component: () => import('@/views/delivery/distributionManage'),
meta: { title: '配送方式管理', keepAlive: false, permission: ['table'] }
},
{
path: '/delivery/expressPrice',
name: 'expressPrice',
component: () => import('@/views/delivery/expressPrice'),
meta: { title: 'O2O配送费', keepAlive: false, permission: ['table'] }
},
{
path: '/delivery/distributionPrice',
name: 'distributionPrice',
......
src/views/authority/manageList.vue
View file @ f246e3c9
......@@ -17,11 +17,11 @@
>
<span slot="action" slot-scope="text, record">
<template>
<a @click="handleEdit(record)">编辑</a>
<a-divider type="vertical" />
<a-popconfirm title="是否要删除此行？" @confirm="remove(record.ID)">
<a @click="handleEdit(record)">角色分配</a>
<!-- <a-divider type="vertical" /> -->
<!-- <a-popconfirm title="是否要删除此行？" @confirm="remove(record.ID)">
<a>删除</a>
</a-popconfirm>
</a-popconfirm> -->
</template>
</span>
</s-table>
......
src/views/delivery/distributionManage.vue 0 → 100644
View file @ f246e3c9
<template>
<div>
<a-card style="margin-bottom:10px">
<div class="table-operator">
<a-button-group>
<a-button type='primary' icon='plus' @click="goEdit(1)">添加管理员</a-button>
</a-button-group>
</div>
<s-table
style="margin-top:10px"
ref="table"
size="default"
rowKey="GUID"
:columns="columns"
:data="loadData"
:showPagination="pagination"
>
<span slot="action" slot-scope="text, record">
<template>
<a @click="handleEdit(record)">角色分配</a>
<!-- <a-divider type="vertical" /> -->
<!-- <a-popconfirm title="是否要删除此行？" @confirm="remove(record.ID)">
<a>删除</a>
</a-popconfirm> -->
</template>
</span>
</s-table>
</a-card>
</div>
</template>
<script>
// , addMenu, updateMenu, deleteMenu
import moment from 'moment'
import { STable } from '@/components'
import { getMangeList } from '@/api/authority'
export default {
name:"authority",
components: {
STable
},
data() {
return {
labelCol: {
xs: { span: 5 }
},
wrapperCol: {
xs: { span: 17 }
},
form: this.$form.createForm(this),
columns: [
{
title: '管理员姓名',
dataIndex: 'NAME'
},
{
title: '手机号',
dataIndex: 'MOBILEPHONE'
},
{
title: '创建时间',
dataIndex: 'CREATE_DATE'
},
{
title: '角色',
dataIndex: 'ROLENAME'
},
{
title: '操作',
dataIndex: 'action',
width: '150px',
scopedSlots: { customRender: 'action' }
}
],
// listData:[],
pagination:false,
// 加载数据方法 必须为 Promise 对象
loadData: parameter => {
console.log('shujujiazai')
return getMangeList(Object.assign(parameter, this.queryParam)).then(res => {
console.log('1212121')
console.log(res)
// this.listData = res
// console.log(this.listData)
// res.data=this.listData
return res
})
},
selectedRowKeys: [],
selectedRows: [],
modalNow: 1
}
},
methods: {
}
}
</script>
<style>
.ant-card-body {
padding: 10px;
}
.ant-card-wider-padding .ant-card-body {
padding: 10px;
}
.ant-table-tbody > tr > td {
padding: 10px 10px;
}
</style>
src/views/delivery/distributionMode.vue 0 → 100644
View file @ f246e3c9
<template>
<div>
<a-card style="margin-bottom:10px">
<div class="table-operator">
<a-button-group>
<a-button type='primary' icon='plus' @click="goEdit(1)">添加快递</a-button>
</a-button-group>
</div>
<s-table
style="margin-top:10px"
ref="table"
size="default"
rowKey="GUID"
:columns="columns"
:data="loadData"
:showPagination="pagination"
>
<span slot="action" slot-scope="text, record">
<template>
<a @click="handleEdit(record)">编辑</a>
<a-divider type="vertical" />
<a-popconfirm title="是否要删除此行？" @confirm="remove(record.ID)">
<a>删除</a>
</a-popconfirm>
</template>
</span>
</s-table>
</a-card>
</div>
</template>
<script>
// , addMenu, updateMenu, deleteMenu
import moment from 'moment'
import { STable } from '@/components'
import { getDistributionModeList } from '@/api/delivery'
export default {
name:"delivery",
components: {
STable
},
data() {
return {
labelCol: {
xs: { span: 5 }
},
wrapperCol: {
xs: { span: 17 }
},
form: this.$form.createForm(this),
columns: [
{
title: '配送方式CODE',
dataIndex: 'CODE'
},
{
title: '名称',
dataIndex: 'NAME'
},
{
title: '描述',
dataIndex: 'DESCRIPTION'
},
{
title: '是否启用',
dataIndex: 'STATE'
},
{
title: '是否支持线下付款',
dataIndex: 'IS_UNDERLINE_PAY'
},
{
title: '积分商城中是否启用',
dataIndex: 'POINTS_STATE'
},
{
title: '小程序中是否启用',
dataIndex: 'ROMENS_RENT_STATE'
},
{
title: '定时达时间间隔',
dataIndex: 'DSDINTERVAL'
},
{
title: '配送方式类型',
dataIndex: 'TRANSPOR_TYPE'
},
{
title: '额外费用',
dataIndex: 'EXTRA_MONEY'
},
{
title: '配送时间',
dataIndex: 'DELIVERY_TIME'
},
{
title: '排序序号',
dataIndex: 'ORDER_INDEX'
},
{
title: '操作',
dataIndex: 'action',
width: '150px',
scopedSlots: { customRender: 'action' }
}
],
listData:[],
pagination:false,
// 加载数据方法 必须为 Promise 对象
loadData: parameter => {
console.log('shujujiazai')
return getDistributionModeList(Object.assign(parameter, this.queryParam)).then(res => {
console.log('1212121')
console.log(res)
this.listData = res
console.log(this.listData)
res.data=this.listData
return res
})
},
selectedRowKeys: [],
selectedRows: [],
modalNow: 1
}
},
methods: {
}
}
</script>
<style>
.ant-card-body {
padding: 10px;
}
.ant-card-wider-padding .ant-card-body {
padding: 10px;
}
.ant-table-tbody > tr > td {
padding: 10px 10px;
}
</style>
src/views/delivery/expressPrice.vue 0 → 100644
View file @ f246e3c9
<template>
<a-card :bordered="false">
<div class="table-page-search-wrapper">
<a-form :form="newform" layout="inline">
<a-row :gutter="48">
<a-col :md="8" :sm="24">
<a-form-item label="门店编码">
<a-input v-model="queryParam.BRANCH_INFO" placeholder />
</a-form-item>
</a-col>
<a-col :md="!advanced && 8 || 24" :sm="24">
<span
class="table-page-search-submitButtons"
:style="advanced && { float: 'right', overflow: 'hidden' } || {} "
>
<!-- <a-button type="primary" @click="getData">查询</a-button> -->
<a-button type="primary" @click="$refs.table.refresh(true)">查询</a-button>
<a-button style="margin-left: 8px" @click="() => queryParam = {}">重置</a-button>
</span>
</a-col>
</a-row>
</a-form>
</div>
<div class="table-operator">
<a-button @click="goEdit(1)" type="primary" icon="plus">批量修改配送费</a-button>
<a-button type='primary' icon='import'>批量修改配送费导入模板</a-button>
</div>
<s-table
ref="table"
size="default"
rowKey="SCDS_GUID"
:columns="columns"
:data="loadData"
showPagination="auto"
>
<span slot="action" slot-scope="text, record">
<a type="primary" @click="goEdit(record)">编辑</a>
<!-- <a-divider type="vertical" />
<a-popconfirm title="是否要删除此行？" @confirm="remove(record.GUID)">
<a>删除</a>
</a-popconfirm> -->
</span>
</s-table>
<!-- <a-modal title="操作" :width="800" v-model="visible" :footer="null">
</a-modal> -->
</a-card>
</template>
<script>
import moment from 'moment'
import { STable } from '@/components'
import { getExpressPrice } from '@/api/delivery'
export default {
name: 'delivery',
components: {
STable
},
data() {
return {
visible: false,
labelCol: {
xs: { span: 24 },
sm: { span: 5 }
},
wrapperCol: {
xs: { span: 24 },
sm: { span: 16 }
},
newform: this.$form.createForm(this),
formCheck: this.$form.createForm(this),
mdl: {},
// 高级搜索 展开/关闭
advanced: false,
// 查询参数
queryParam: {},
// modal数据
// queryParam1: {},
// 表头
columns: [
// {
// title: '用户GUID',
// dataIndex: 'GUID'
// },
{
title: '门店名称',
dataIndex: 'BRANCH_NAME'
},
{
title: '门店编码',
dataIndex: 'BRANCH_CODE'
},
{
title: '收费方式',
dataIndex: 'REGION_TYPE'
},
{
title: '区域运费',
dataIndex: 'DELIVERY_PRICE'
},
{
title: '基础公里数',
dataIndex: 'REGION_DISTR_DISTANCE'
},
{
title: '基础运费',
dataIndex: 'REGION_DISTR_PRICE'
},
{
title: '不同配送费每增加X公里',
dataIndex: 'INCREASE_DISTANCE'
},
{
title: '不同配送费每增加X公里增加X元',
dataIndex: 'INCREASE_PRICE'
},
{
title: '操作',
dataIndex: 'deleted',
width: '150px',
scopedSlots: { customRender: 'action' }
}
],
// 加载数据方法 必须为 Promise 对象
loadData: parameter => {
return getExpressPrice(Object.assign(parameter, this.queryParam)).then(res => {
console.log(res)
res.pageSize = res._meta.perPage
res.page = res._meta.currentPage
res.totalPage = res._meta.pageCount
res.totalCount = res._meta.totalCount
// res.data = []
// res.data = res.userdepartment
console.log(res.data)
return res
})
},
selectedRowKeys: [],
selectedRows: []
}
},
created() {},
methods: {
goEdit (value) {
if(value==1){
this.$router.push({path:'/userstaff/details/Eminforman_editor',query:{goid:1}})
}else{
console.log(value)
this.$router.push({path:'/userstaff/details/Eminforman_editor',query:{goid:0,GUID:value.GUID}})
}
},
// handleEdit(record) {
// this.visible = true
// var that = this
// getEminformanDetails(record.GUID)
// .then(res => {
// // this.radioVal = res.data[0]
// // console.log(res.data[0])
// // this.modalForm.initialValue(res.data[0])
// this.$nextTick(() => {
// this.formCheck.setFieldsValue(res)
// })
// })
// .catch(err => {
// console.log(err)
// })
// // this.queryParam1 = Object.assign({}, record)
// },
remove ( key ) {
console.log(key)
deleteEminforman(key).then(res => {
console.log('已删除')
this.$refs.table.refresh();
}).catch(err => {
})
},
// handleOk() {
// this.$refs.table.refresh()
// },
onSelectChange(selectedRowKeys, selectedRows) {
this.selectedRowKeys = selectedRowKeys
this.selectedRows = selectedRows
},
// toggleAdvanced() {
// this.advanced = !this.advanced
// },
resetSearchForm() {
this.queryParam = {
date: moment(new Date())
}
}
}
}
</script>
src/views/storedc/Scategorymg.vue
View file @ f246e3c9
......@@ -24,26 +24,6 @@
</template>
</span>
</s-table>
<!-- <a-modal :destroyOnClose="destroyOnClose" title="操作" :width="800" v-model="visible" @ok="handleOk">
<a-form :form="modalForm">
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="服务类目名称">
<a-input v-decorator="['NAME']" name="NAME" placeholder="请输入服务类目名称" />
</a-form-item>
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="服务类目编号">
<a-input v-decorator="['CODE']" name="CODE" placeholder="请输入服务类目编号" />
</a-form-item>
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="主题颜色">
<a-input v-decorator="['THEME_COLOR']" name="THEME_COLOR" placeholder="请输入主题颜色" />
</a-form-item>
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="服务类目描述">
<a-input v-decorator="['DESCRIPTION']" name="DESCRIPTION" placeholder="请输入服务类目描述" />
</a-form-item>
<a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="创建时间">
<a-date-picker showTime v-decorator="['CREATE_TIME',{normalize:DateCheck}]" />
</a-form-item>
</a-form>
</a-modal> -->
</a-card>
</template>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment