yxt_product
/
yxt-yyth-ui-admin
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

2023-12-15

master
guoxing 2 years ago
parent
fc6090f1c0
commit
ee5930441e
8 changed files with 301 additions and 196 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      src/api/pickupPoint/pickupPoint.js
  2. 43
      src/layout/components/Sidebar/index.vue
  3. 50
      src/router/index.js
  4. 31
      src/views/marketingCard/index.vue
  5. 14
      src/views/network/index.vue
  6. 25
      src/views/order/distributionCount.vue
  7. 50
      src/views/pickupPoint/index.vue
  8. 34
      src/views/pickupPoint/indexAdd.vue

8
src/api/pickupPoint/pickupPoint.js
View File

@ -2,6 +2,14 @@ import request from '@/utils/request'
export default { export default {
// 获取支行选择列表
bankSelect: function(data) {
return request({
url: '/lpkbank/listAll',
method: 'get'
});
},
// 获取提货点列表 // 获取提货点列表
storeListPage: function(data) { storeListPage: function(data) {
return request({ return request({

43
src/layout/components/Sidebar/index.vue
View File

@ -122,6 +122,16 @@
name: "/pickupPoint/index", name: "/pickupPoint/index",
path: "/pickupPoint/index" path: "/pickupPoint/index"
}, },
{
alwaysShow: true,
component: "network",
meta: {
icon: "el-icon-menu",
title: "支行管理",
},
name: "/network/index",
path: "/network/index"
},
{ {
alwaysShow: true, alwaysShow: true,
component: "commodity", component: "commodity",
@ -157,7 +167,27 @@
component: "distributionCount", component: "distributionCount",
meta: { meta: {
icon: "el-icon-help", icon: "el-icon-help",
title: "配货统计", title: "网点配货统计",
},
name: "/order/distributionCount",
path: "/order/distributionCount",
},
{
alwaysShow: true,
component: "distributionCount",
meta: {
icon: "el-icon-help",
title: "支行配货统计",
},
name: "/order/distributionCount",
path: "/order/distributionCount",
},
{
alwaysShow: true,
component: "distributionCount",
meta: {
icon: "el-icon-help",
title: "总配货统计",
}, },
name: "/order/distributionCount", name: "/order/distributionCount",
path: "/order/distributionCount", path: "/order/distributionCount",
@ -186,16 +216,7 @@
name: "/print/index", name: "/print/index",
path: "/print/index" path: "/print/index"
} }
// {
// alwaysShow: true,
// component: "network",
// meta: {
// icon: "el-icon-menu",
// title: "网点管理",
// },
// name: "/network/index",
// path: "/network/index"
// },
// { // {
// alwaysShow: true, // alwaysShow: true,
// component: "statisticalReport", // component: "statisticalReport",

50
src/router/index.js
View File

@ -133,6 +133,21 @@ export const constantRoutes = [
} }
},] },]
}, },
{
path: '/network',
component: Layout,
redirect: '/network/index',
children: [{
path: '/network/index',
component: () =>
import('@/views/network/index.vue'),
name: 'index',
meta: {
title: '支行管理'
}
},]
},
{ {
path: '/commodity', path: '/commodity',
component: Layout, component: Layout,
@ -165,9 +180,26 @@ export const constantRoutes = [
import('@/views/order/distributionCount.vue'), import('@/views/order/distributionCount.vue'),
name: 'distributionCount', name: 'distributionCount',
meta: { meta: {
title: '配货统计' title: '网点配货统计'
} }
},] },{
path: '/order/distributionCount',
component: () =>
import('@/views/order/distributionCount.vue'),
name: 'distributionCount',
meta: {
title: '支行配货统计'
}
},
{
path: '/order/distributionCount',
component: () =>
import('@/views/order/distributionCount.vue'),
name: 'distributionCount',
meta: {
title: '总配货统计'
}
}]
},{ },{
path: '/statisticalReport', path: '/statisticalReport',
component: Layout, component: Layout,
@ -215,20 +247,6 @@ export const constantRoutes = [
},] },]
}, },
// {
// path: '/network',
// component: Layout,
// redirect: '/network/index',
// children: [{
// path: '/network/index',
// component: () =>
// import('@/views/network/index.vue'),
// name: 'index',
// meta: {
// title: '网点管理'
// }
// },]
// },
...codemenu, ...codemenu,
{ {

31
src/views/marketingCard/index.vue
View File

@ -36,10 +36,23 @@
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="primary" size="mini" @click="toDetail(scope.row)">详情</el-button> <el-button type="primary" size="mini" @click="toDetail(scope.row)">详情</el-button>
<el-button type="primary" size="mini" @click="toRelevancy(scope.row)">编辑</el-button> <el-button type="primary" size="mini" @click="toRelevancy(scope.row)">编辑</el-button>
<el-button type="primary" size="mini" @click="toRelevancyInfo(scope.row)">删除</el-button> <!-- <el-button type="primary" size="mini" @click="toRelevancyInfo(scope.row)">删除</el-button> -->
</template>
</el-table-column>
<el-table-column label="是否上架" align="center" width="140">
<template slot-scope="scope">
<el-switch
v-model="scope.row.isEnable"
active-text="上架"
inactive-text="下架"
active-value="1"
inactive-value="0"
@change="enableChange(scope.row.sid,scope.row.isEnable)"
/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="name" label="礼包名称" align="center" /> <el-table-column prop="name" label="礼包名称" align="center" />
<el-table-column label="礼包图片" align="center"> <el-table-column label="礼包图片" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-popover placement="left" trigger="click" width="300"> <el-popover placement="left" trigger="click" width="300">
@ -247,6 +260,22 @@
}, },
resetState() { resetState() {
this.viewState = 1 this.viewState = 1
},
enableChange(sid, state) {
console.log('sid', sid)
console.log('state', state)
req.updateIsEnable(sid, state).then((resp) => {
if (resp.success) {
this.$message({
type: 'success',
message: '状态已更新',
showClose: true
})
} else { // 根据resp.code进行异常情况处理
}
}).catch(e => {
console.log(e)
})
} }
} }
} }

14
src/views/network/index.vue
View File

@ -1,7 +1,7 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<div v-show="viewState == 1"> <div v-show="viewState == 1">
<button-bar ref="btnbar" view-title="网点列表" :btndisabled="btndisabled" @btnhandle="btnHandle" /> <button-bar ref="btnbar" view-title="支行列表" :btndisabled="btndisabled" @btnhandle="btnHandle" />
<div class="main-content"> <div class="main-content">
<div class="searchcon"> <div class="searchcon">
<el-button size="small" class="searchbtn" @click="clicksearchShow"> <el-button size="small" class="searchbtn" @click="clicksearchShow">
@ -9,7 +9,7 @@
</el-button> </el-button>
<div v-show="isSearchShow" class="search"> <div v-show="isSearchShow" class="search">
<el-form :inline="true" class="tab-header"> <el-form :inline="true" class="tab-header">
<el-form-item label="网点名称"> <el-form-item label="支行名称">
<el-input v-model="queryParams.params.name" placeholder="" clearable /> <el-input v-model="queryParams.params.name" placeholder="" clearable />
</el-form-item> </el-form-item>
@ -24,7 +24,7 @@
</div> </div>
<!-- Start 项目列表头部 --> <!-- Start 项目列表头部 -->
<div class="listtop"> <div class="listtop">
<div class="tit">网点列表</div> <div class="tit">支行列表</div>
</div> </div>
<!-- End 项目列表头部 --> <!-- End 项目列表头部 -->
<!-- Start 项目列表 --> <!-- Start 项目列表 -->
@ -38,11 +38,11 @@
<el-button type="primary" size="mini" @click="toRelevancyInfo(scope.row)">删除</el-button> <el-button type="primary" size="mini" @click="toRelevancyInfo(scope.row)">删除</el-button>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="name" label="网点名称" align="center" /> <el-table-column prop="name" label="支行名称" align="center" />
<el-table-column prop="shortName" label="网点简称" align="center" /> <el-table-column prop="shortName" label="支行简称" align="center" />
<el-table-column prop="linker" label="联系人" align="center" /> <el-table-column prop="linker" label="联系人" align="center" />
<el-table-column prop="linkPhone" label="联系电话" align="center" /> <el-table-column prop="linkPhone" label="联系电话" align="center" />
<el-table-column prop="address" label="网点地址" align="center" /> <el-table-column prop="address" label="支行地址" align="center" />
</el-table> </el-table>
</div> </div>
@ -191,7 +191,7 @@
}, },
toRelevancyInfo(row) { toRelevancyInfo(row) {
const tip = '请确认是否删除所选网点?' const tip = '请确认是否删除所选支行?'
this.$confirm(tip, '提示', { this.$confirm(tip, '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',

25
src/views/order/distributionCount.vue
View File

@ -49,7 +49,7 @@
<!-- End 项目列表头部 --> <!-- End 项目列表头部 -->
<!-- Start 项目列表 --> <!-- Start 项目列表 -->
<div class=""> <div class="">
<el-table v-loading="tableLoading" :data="dataList" border style="width: 100%"> <el-table v-loading="tableLoading" :data="dataList" border style="width: 100%" :cell-style="cell">
<!-- <el-table-column fixed width="50" type="selection" align="center" /> --> <!-- <el-table-column fixed width="50" type="selection" align="center" /> -->
<el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" /> <el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
<!-- <el-table-column label="操作" align="center" width="120"> <!-- <el-table-column label="操作" align="center" width="120">
@ -59,7 +59,19 @@
</el-table-column> --> </el-table-column> -->
<el-table-column prop="reserveDate" label="预约日期" align="center" /> <el-table-column prop="reserveDate" label="预约日期" align="center" />
<el-table-column prop="store" label="提货门店" align="center" /> <el-table-column prop="store" label="提货门店" align="center" />
<el-table-column prop="goodsInfo" label="商品明细" align="center" /> <!-- <el-table-column prop="goodsInfo" label="商品明细" align="center" /> -->
<el-table-column label="商品明细" align="center" >
<!-- 分行显示 -->
<template slot-scope="scope">
<div v-for="(item,index) in scope.row.goods" style="width: 100%;height: 100%;">
<div style="width: 100%;padding:10px"
:style="{'border-bottom':(index!=scope.row.goods.length-1?'1px solid #DFE6EC':'none')}">{{item}}</div>
</div>
</template>
</el-table-column>
</el-table> </el-table>
</div> </div>
<!-- End 项目列表 --> <!-- End 项目列表 -->
@ -138,6 +150,12 @@
this.loadList() this.loadList()
}, },
methods: { methods: {
//改变单行蓝色和绿色
cell({row , column , rowIndex , columnIndex}){
if(columnIndex==3){
return 'padding: 0px'
}
},
// 搜索条件效果 // 搜索条件效果
clicksearchShow() { clicksearchShow() {
this.isSearchShow = !this.isSearchShow this.isSearchShow = !this.isSearchShow
@ -273,4 +291,7 @@
} }
</script> </script>
<style scoped> <style scoped>
::v-deep .el-table .cell {
padding: 0px ;
}
</style> </style>

50
src/views/pickupPoint/index.vue
View File

@ -14,18 +14,10 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
<div class="btn" style="text-align: center;"> <div class="btn" style="text-align: center;">
<el-button <el-button type="primary" size="small" icon="el-icon-search"
type="primary" @click="dosearch">查询</el-button>
size="small" <el-button type="primary" size="small" icon="el-icon-refresh"
icon="el-icon-search" @click="resetQuery">重置</el-button>
@click="dosearch"
>查询</el-button>
<el-button
type="primary"
size="small"
icon="el-icon-refresh"
@click="resetQuery"
>重置</el-button>
</div> </div>
</div> </div>
</div> </div>
@ -36,7 +28,8 @@
<!-- End 项目列表头部 --> <!-- End 项目列表头部 -->
<!-- Start 项目列表 --> <!-- Start 项目列表 -->
<div class=""> <div class="">
<el-table v-loading="tableLoading" :data="dataList" border style="width: 100%" :row-style="{height: '40px'}"> <el-table v-loading="tableLoading" :data="dataList" border style="width: 100%"
:row-style="{height: '40px'}">
<!-- <el-table-column fixed width="50" type="selection" align="center" /> --> <!-- <el-table-column fixed width="50" type="selection" align="center" /> -->
<el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" /> <el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
<el-table-column label="操作" align="center" width="100"> <el-table-column label="操作" align="center" width="100">
@ -47,20 +40,15 @@
</el-table-column> </el-table-column>
<el-table-column label="是否禁用" align="center" width="140"> <el-table-column label="是否禁用" align="center" width="140">
<template slot-scope="scope"> <template slot-scope="scope">
<el-switch <el-switch v-model="scope.row.isEnable" active-text="可用" inactive-text="禁用"
v-model="scope.row.isEnable" active-value="1" inactive-value="0"
active-text="可用" @change="enableChange(scope.row.sid,scope.row.isEnable)" />
inactive-text="禁用"
active-value="1"
inactive-value="0"
@change="enableChange(scope.row.sid,scope.row.isEnable)"
/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="name" label="提货点名称" align="center" width="200" /> <el-table-column prop="name" label="提货点名称" align="center" width="250" />
<!-- <el-table-column prop="code" label="提货点编号" align="center" /> --> <el-table-column prop="phone" label="联系电话" align="center" width="150" />
<el-table-column prop="phone" label="联系电话" align="center" width="120" />
<el-table-column prop="address" label="提货点地址" align="center" /> <el-table-column prop="address" label="提货点地址" align="center" />
<el-table-column prop="bankName" label="所属支行" width="250" align="center" />
<el-table-column prop="businessHours" label="营业时间" align="center" width="200" /> <el-table-column prop="businessHours" label="营业时间" align="center" width="200" />
<el-table-column prop="sort" label="排序" align="center" width="80" /> <el-table-column prop="sort" label="排序" align="center" width="80" />
</el-table> </el-table>
@ -69,14 +57,8 @@
<div class="pages"> <div class="pages">
<div class="tit" /> <div class="tit" />
<!-- 翻页 --> <!-- 翻页 -->
<pagination <pagination v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current"
v-show="dataList.length > 0" :limit.sync="queryParams.size" class="pagination" @pagination="loadList" />
:total="queryParams.total"
:page.sync="queryParams.current"
:limit.sync="queryParams.size"
class="pagination"
@pagination="loadList"
/>
</div> </div>
</div> </div>
</div> </div>
@ -107,8 +89,7 @@
searchxianshitit: '显示查询条件', searchxianshitit: '显示查询条件',
tableLoading: false, tableLoading: false,
dataList: [], dataList: [],
btnList: [ btnList: [{
{
type: 'primary', type: 'primary',
size: 'small', size: 'small',
icon: 'plus', icon: 'plus',
@ -266,4 +247,3 @@
</script> </script>
<style scoped> <style scoped>
</style> </style>

34
src/views/pickupPoint/indexAdd.vue
View File

@ -44,6 +44,14 @@
<span class="item_text">经纬度：</span> <span class="item_text">经纬度：</span>
<el-input v-model="formobj.lonAndLat" placeholder="经纬度,以逗号分隔" class="item_input" clearable /> <el-input v-model="formobj.lonAndLat" placeholder="经纬度,以逗号分隔" class="item_input" clearable />
</div> </div>
<div class="item">
<span class="item_text">所属支行：</span>
<el-select v-model="formobj.bankName" filterable class="item_input" clearable placeholder="请选择"
style="width:100%" @change="bankSelect">
<el-option v-for="item in bankList" :key="item.name" :label="item.name" :value="item.sid">
</el-option>
</el-select>
</div>
</el-card> </el-card>
@ -68,10 +76,25 @@
sort: 0, sort: 0,
linker: '', linker: '',
picUrl: '', picUrl: '',
lonAndLat: '' lonAndLat: '',
} bankName: "",
bankSid: ""
},
bankList: []
} }
}, },
created() {
req.bankSelect()
.then(resp => {
console.log('>>>>>>>>>bankSelect', resp)
this.bankList = resp.data
console.log('>>>>>>>>>bankSelect', this.bankList)
})
.catch(() => {})
},
methods: { methods: {
saveOrUpdate() { saveOrUpdate() {
@ -103,7 +126,9 @@
sort: 0, sort: 0,
linker: '', linker: '',
picUrl: '', picUrl: '',
lonAndLat: '' lonAndLat: '',
bankName: "",
bankSid: ""
} }
this.$emit('doback') this.$emit('doback')
}, },
@ -121,6 +146,9 @@
.catch(e => { .catch(e => {
this.formobj = row this.formobj = row
}) })
},
bankSelect(val) {
this.formobj.bankSid = val
} }
} }
} }

Write Preview
Loading…
Cancel
Save