yxt_group
/
lipinka_admin_ui
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

完善bug

master
myTest383 4 months ago
parent
df1fa45926
commit
2abd31e3da
9 changed files with 2093 additions and 2094 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      src/layout/components/Navbar.vue
  2. 22
      src/layout/components/Sidebar/index.vue
  3. 4
      src/router/index.js
  4. 18
      src/views/network/index.vue
  5. 2
      src/views/network/indexAdd.vue
  6. 5
      src/views/order/allDistributionCount.vue
  7. 9
      src/views/order/distributionCount.vue
  8. 12
      src/views/order/index.vue
  9. 13
      src/views/order/subBranch.vue

10
src/layout/components/Navbar.vue
View File

@ -1,12 +1,16 @@
<template>
<div>
<div class="navbar">
<p class="breadcrumb-container"><img src="@/assets/loginImg/logo.png" style="width: 45px;height: 45px;margin-right: 10px;"/>汇融惠享管理平台</p>
<p class="breadcrumb-container"><img src="@/assets/loginImg/logo.png"
style="width: 45px;height: 45px;margin-right: 10px;" />汇融惠享管理平台</p>
<!-- <h3 class="breadcrumb-container">汇融银行供应链贷后监管平台</h3> -->
<div class="right-menu">
<!-- <p>{{Orgname}} {{departmentName}} 欢迎, {{name}}</p>-->
<!-- <p>欢迎您，{{name}}</p>
<p class="dy" @click="logout()"><img src="@/assets/images/dy.png"></p> -->
<!-- <p>欢迎您：{{pNameAndDepartmentNameAndPostName}}- {{name}}</p> -->
<p>欢迎您：系统管理员</p>
<!-- <img src="@/assets/images/info.png"> -->
<!-- <img src="@/assets/images/dy.png" @click="logout"> -->
<span class="backToHome" @click="logout"><i class="el-icon-back"></i>退出登录</span>
</div>
</div>
<el-footer class="footer" height="40px">Copyright © {{ year }} 汇融惠享管理平台 All Rights Reserved</el-footer>

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

@ -174,16 +174,16 @@
name: "/pickupPoint/index",
path: "/pickupPoint/index"
},
// {
// alwaysShow: true,
// component: "network",
// meta: {
// icon: "el-icon-menu",
// title: "支行管理",
// },
// name: "/network/index",
// path: "/network/index"
// },
{
alwaysShow: true,
component: "network",
meta: {
icon: "el-icon-menu",
title: "区域管理",
},
name: "/network/index",
path: "/network/index"
},
{
alwaysShow: true,
component: "commodity",
@ -229,7 +229,7 @@
component: "subBranch",
meta: {
icon: "el-icon-help",
title: "支行配货统计",
title: "区域配货统计",
},
name: "/order/subBranch",
path: "/order/subBranch",

4
src/router/index.js
View File

@ -184,7 +184,7 @@ export const constantRoutes = [{
import('@/views/network/index.vue'),
name: 'index',
meta: {
title: '支行管理'
title: '区域管理'
}
}, ]
},
@ -229,7 +229,7 @@ export const constantRoutes = [{
import('@/views/order/subBranch.vue'),
name: 'subBranch',
meta: {
title: '支行配货统计'
title: '区域配货统计'
}
},
{

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

@ -1,7 +1,7 @@
<template>
<div class="app-container">
<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="searchcon">
<el-button size="small" class="searchbtn" @click="clicksearchShow">
@ -9,7 +9,7 @@
</el-button>
<div v-show="isSearchShow" class="search">
<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-form-item>
@ -24,12 +24,13 @@
</div>
<!-- Start 项目列表头部 -->
<div class="listtop">
<div class="tit">支行列表</div>
<div class="tit">区域列表</div>
</div>
<!-- End 项目列表头部 -->
<!-- Start 项目列表 -->
<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="60" label="序号" type="index" :index="indexMethod" align="center" />
<el-table-column label="操作" align="center" width="180">
@ -38,11 +39,11 @@
<el-button type="primary" size="mini" @click="toRelevancyInfo(scope.row)">删除</el-button>
</template>
</el-table-column>
<el-table-column prop="name" label="支行名称" align="center" />
<el-table-column prop="shortName" label="支行简称" align="center" />
<el-table-column prop="name" label="区域名称" align="center" />
<el-table-column prop="shortName" label="区域简称" align="center" />
<el-table-column prop="linker" 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>
</div>
@ -82,8 +83,7 @@
searchxianshitit: '显示查询条件',
tableLoading: false,
dataList: [],
btnList: [
{
btnList: [{
type: 'primary',
size: 'small',
icon: 'plus',

2
src/views/network/indexAdd.vue
View File

@ -3,7 +3,7 @@
<div class="tab-header webtop">
<!-- 标题 -->
<div>网点信息</div>
<div>区域信息</div>
<!-- start 添加修改按钮 -->
<div>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate">保存</el-button>

5
src/views/order/allDistributionCount.vue
View File

@ -9,14 +9,13 @@
</el-button>
<div v-show="isSearchShow" class="search">
<el-form :inline="true" class="tab-header">
<el-form-item label="预约开始日期">
<el-form-item label="预约日期">
<el-date-picker v-model="page.params.startDate" @change="selectTime1" type="date"
placeholder="选择日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd"
style="width: 200px;">
</el-date-picker>
</el-form-item>
<el-form-item label="预约结束日期">
至
<el-date-picker v-model="page.params.endDate" @change="selectTime2" type="date"
placeholder="选择日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd"
style="width: 200px;">

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

@ -9,21 +9,20 @@
</el-button>
<div v-show="isSearchShow" class="search">
<el-form :inline="true" class="tab-header">
<el-form-item label="预约开始日期">
<el-form-item label="预约日期">
<el-date-picker v-model="page.params.startDate" @change="selectTime1" type="date"
placeholder="选择日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd"
style="width: 200px;">
</el-date-picker>
</el-form-item>
<el-form-item label="预约结束日期">
至
<el-date-picker v-model="page.params.endDate" @change="selectTime2" type="date"
placeholder="选择日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd"
style="width: 200px;">
</el-date-picker>
</el-form-item>
<el-form-item label="所属支行">
<el-form-item label="所属区域">
<el-select v-model="page.params.bankSid" filterable class="item_input" clearable
placeholder="请选择" style="width:100%" @change="bankSelect">
<el-option v-for="item in bankList" :key="item.name" :label="item.name"
@ -75,7 +74,7 @@
</el-table-column> -->
<el-table-column prop="cardType" label="卡券类型" align="center" />
<el-table-column prop="reserveDate" label="预约日期" align="center" />
<el-table-column prop="bankName" label="所属支行" align="center" />
<el-table-column prop="bankName" label="所属区域" align="center" />
<el-table-column prop="store" label="提货地点" align="center" />
<el-table-column prop="goodsName" label="商品名称" align="center" />
<el-table-column prop="goodsNumber" label="数量(份)" align="center" />

12
src/views/order/index.vue
View File

@ -9,21 +9,20 @@
</el-button>
<div v-show="isSearchShow" class="search">
<el-form :inline="true" class="tab-header">
<el-form-item label="预约开始日期">
<el-form-item label="预约日期">
<el-date-picker v-model="page.params.startDate" @change="selectTime1" type="date"
placeholder="选择日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd"
style="width: 200px;">
</el-date-picker>
</el-form-item>
<el-form-item label="预约结束日期">
至
<el-date-picker v-model="page.params.endDate" @change="selectTime2" type="date"
placeholder="选择日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd"
style="width: 200px;">
</el-date-picker>
</el-form-item>
<el-form-item label="所属支行">
<el-form-item label="所属区域">
<el-select v-model="page.params.bankSid" filterable class="item_input" clearable
placeholder="请选择" style="width:100%" @change="bankSelect">
<el-option v-for="item in bankList" :key="item.name" :label="item.name"
@ -78,7 +77,7 @@
</el-table-column>
<el-table-column prop="cardType" label="卡券类型" align="center" />
<el-table-column prop="reserveDate" label="预约日期" align="center" />
<el-table-column prop="bankName" label="所属支行" align="center" />
<el-table-column prop="bankName" label="所属区域" align="center" />
<el-table-column prop="store" label="提货地点" align="center" />
<el-table-column prop="serialNumber" label="卡券序列号" align="center" />
<el-table-column prop="bagName" label="礼包类型" align="center" />
@ -156,8 +155,7 @@
},
giftPackList: [],
bankList: [],
cardTypeList:[
{
cardTypeList: [{
text: "全部",
sid: ""
},

13
src/views/order/subBranch.vue
View File

@ -1,7 +1,7 @@
<template>
<div class="app-container">
<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="searchcon">
<el-button size="small" class="searchbtn" @click="clicksearchShow">
@ -9,14 +9,13 @@
</el-button>
<div v-show="isSearchShow" class="search">
<el-form :inline="true" class="tab-header">
<el-form-item label="预约开始日期">
<el-form-item label="预约日期">
<el-date-picker v-model="page.params.startDate" @change="selectTime1" type="date"
placeholder="选择日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd"
style="width: 200px;">
</el-date-picker>
</el-form-item>
<el-form-item label="预约结束日期">
至
<el-date-picker v-model="page.params.endDate" @change="selectTime2" type="date"
placeholder="选择日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd"
style="width: 200px;">
@ -24,7 +23,7 @@
</el-form-item>
<el-form-item label="支行名称">
<el-form-item label="区域名称">
<el-select v-model="page.params.bankSid" filterable class="item_input" clearable
placeholder="请选择" style="width:100%" @change="bankSelect">
<el-option v-for="item in bankList" :key="item.name" :label="item.name"
@ -69,10 +68,10 @@
</el-table-column> -->
<el-table-column prop="cardType" label="卡券类型" align="center" />
<el-table-column prop="reserveDate" label="预约日期" align="center" />
<el-table-column prop="bankName" label="支行名称" align="center" />
<el-table-column prop="bankName" label="区域名称" align="center" />
<el-table-column prop="goodsName" label="商品名称" align="center" />
<el-table-column prop="goodsNumber" label="数量(份)" align="center" />
<el-table-column prop="address" label="支行地址" align="center" />
<el-table-column prop="address" label="区域地址" align="center" />
<el-table-column prop="linker" label="联系人" align="center" />
<el-table-column prop="linkPhone" label="联系电话" align="center" />

Write Preview
Loading…
Cancel
Save