dianliang/oil-station
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

10.11

Browse Source
This commit is contained in:
DESKTOP-369JRHT\12997 2024-10-12 14:51:25 +08:00
parent fe5cf30c51
commit b3e7f6b61e
7 changed files with 183 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fuintAdmin/src/router/index.js
View File

@ -92,6 +92,7 @@ export const constantRoutes = [
name: 'resourceOilstore',
meta: { title: '系统首页1', icon: 'dashboard', affix: true }
},
// {
// path: 'resource_oilstore',
// component: () => import('@/views/index'),

2
fuintAdmin/src/views/index2.vue
View File

@ -88,7 +88,7 @@ export default {
<style scoped lang="scss">
.app-container{
height: 100%;
}
.banner-box{
width: 100%;

135
fuintAdmin/src/views/notificationList/index.vue Normal file
View File

@ -0,0 +1,135 @@
<template>
<div>
<div class="top-box">
<span style="cursor: pointer" @click="goback()">当前位置：首页--通知公告</span>
</div>
<div class="hui_box">
<div class="top_new">
<el-form :model="queryParams" ref="queryForm" size="small" style="width: 100%" :inline="true" >
<el-form-item label="" prop="payUser">
<el-input
v-model="queryParams.payUser"
placeholder="请输入通知内容的关键词"
clearable
/>
</el-form-item>
<el-form-item label="" prop="payUser">
<el-input
v-model="queryParams.payUser"
placeholder="请选择通知类型"
clearable
/>
</el-form-item>
<el-form-item >
</el-form-item>
</el-form>
<div style="height: 32px;width: 20%;display: flex;justify-content: flex-end">
<el-button type="primary" icon="el-icon-search" @click="">查询</el-button>
<el-button icon="el-icon-refresh" @click="">重置</el-button>
</div>
</div>
<div class="table-box">
<el-table
:data="list"
border
style="width: 100%">
<el-table-column type="index" width="50" align="center" label="序号"/>
<el-table-column label="通知类型" align="center" prop="orderNo" width="220"/>
<el-table-column label="通知内容" align="center" prop="terminal"/>
<el-table-column label="创建人" align="center" prop="terminal"/>
<el-table-column label="创建时间" align="center" prop="terminal"/>
<el-table-column label="发送时间" align="center" prop="terminal"/>
</el-table>
<div class="pagination-box">
<el-pagination
background
layout="prev, pager, next"
v-show="total>0"
:total="total"
:page.sync="queryParams.page"
:limit.sync="queryParams.pageSize"
@current-change="getList">
</el-pagination>
</div>
</div>
</div>
</div>
</template>
<script>
export default {
name: "order_Goods",
data() {
return {
List:[],
beginTime:'',
endTime:'',
queryParams: {
page: 1,
pageSize: 10,
},
total:0
}
},
methods:{
getList(){
},
goback(){
this.$router.go(-1)
}
}
}
</script>
<style scoped lang="scss">
.top_new{
display: flex;
justify-content: space-between;
background: #fff;
width: 100%;
border-radius: 8px;
box-sizing: border-box;
height: 64px;
margin-bottom: 5px;
box-sizing: border-box;
padding: 15px;
border-radius: 8px;
}
.table-box {
width: 100%;
height: 66vh;
overflow: auto;
background: #FFF;
box-sizing: border-box;
padding: 15px;
border-radius: 8px;
min-height: 78vh;
}
.hui_box{
box-sizing: border-box;
padding: 15px;
background: #f6f8f9;
}
.top-box{
width: 100%;
background: #fff;
box-sizing: border-box;
padding: 10px;
display: flex;
align-items: center;
font-weight: 400;
font-size: 12px;
color: #666666;
padding-left: 25px;
}
</style>

2
fuintAdmin/src/views/order/order_Added.vue
View File

@ -138,7 +138,7 @@
size="mini"
type="text"
@click="returnRecord(scope.row.id)"
>归还详情</el-button>
>170px</el-button>
</template>
</el-table-column>
</el-table>

31
fuintAdmin/src/views/shopowner.vue
View File

@ -1,5 +1,5 @@
<template>
<div class="app-container">
<div class="home-index">
<el-carousel height="230px">
<el-carousel-item v-for="(item,index) in bannerList" :key="index">
<div class="bannser">
@ -35,7 +35,7 @@
<div class="right-box">
<div class="title_">
<div>通知中心</div>
<div style="font-size: 12px;color: #BBBBBB;display: flex;align-items: center">更多 <i class="el-icon-arrow-right"></i> </div>
<div style="font-size: 12px;color: #BBBBBB;cursor: pointer; display: flex;align-items: center" @click="goList()" >更多 <i class="el-icon-arrow-right"></i> </div>
</div>
<!-- <div class="hang_" v-for="(item,index) in 4" :key="index" >【到期提醒】百业兴智慧油站系统将于2024年07月10日到期...</div>-->
<div class="hang_" v-for="(item,index) in noticeList" :key="index" >【{{ item.notificationType }}】{{ item.templateContent }}</div>
@ -58,16 +58,6 @@
@change="getStoreAmount">
</el-date-picker>
</div>
<!-- <div style="margin-right: 40px">-->
<!-- <el-select v-model="value" clearable placeholder="请选择" @change="chooseDept()">-->
<!-- <el-option-->
<!-- v-for="item in options"-->
<!-- :key="item.deptId"-->
<!-- :label="item.deptName"-->
<!-- :value="item.deptId">-->
<!-- </el-option>-->
<!-- </el-select>-->
<!-- </div>-->
</div>
<div class="d-s" style="margin-top: 15px">
<div class="k-box">
@ -252,6 +242,9 @@ export default {
// this.initChart()
},
methods:{
goList(){
this.$router.push('/notificationList/index')
},
// 获取员工排行信息
getEmployeList() {
this.employeLoading = true
@ -804,7 +797,6 @@ export default {
.app-container{
width: 100%;
height: 100%;
/* height: 100vh; */
background: #f4f5f9;
}
.d-s{
@ -827,10 +819,10 @@ export default {
display: flex;
align-items: center;
justify-content: space-between;
margin-top: 20px;
margin-top: 15px;
}
.left-box{
width: 73%;
width: 74%;
background: #FFFFFF;
border-radius: 10px 10px 10px 10px;
border: 1px solid #FFFFFF;
@ -842,7 +834,7 @@ export default {
padding: 15px;
}
.left-box-t{
width: 73%;
width: 74%;
box-sizing: border-box;
padding: 15px;
border-radius: 8px;
@ -869,6 +861,7 @@ export default {
box-sizing: border-box;
padding: 15px;
overflow: auto;
scrollbar-width: none;
}
.san-box{
width: 24%;
@ -880,9 +873,6 @@ export default {
margin-right: 15px;
box-sizing: border-box;
padding: 20px 40px;
//display: flex;
//align-items: center;
//justify-content: space-between;
}
.r-title{
font-weight: bold;
@ -1032,5 +1022,8 @@ export default {
width: 20%;
text-align: center;
}
}
.home-index{
}
</style>

2
fuintCashierWeb/src/views/cashier/NewComponents/credit.vue
View File

@ -230,7 +230,7 @@
<div slot="header" class="clearfix">
<div style="position: relative;">
<div style="position: absolute; top: 50%; left: 50%; transform: translate(-50%, -50%);">
<h2>单据号：{{record.orderNo}}</h2>
<h2>单据号123：{{record.orderNo}}</h2>
</div>
</div>
<br>

59
fuintCashierWeb/src/views/cashier/orderComponents/order_Added.vue
View File

@ -167,36 +167,27 @@
size="55%"
:before-close="handleClose">
<div style="display: grid; place-items: center;">
<el-card style="background-color: #f5f5f5;width: 90%">
<div slot="header" class="clearfix">
<div style="position: relative;">
<div style="position: absolute; top: 50%; left: 50%; transform: translate(-50%, -50%);">
<h2>单据号：{{record.orderNo}}</h2>
</div>
<div class="top_pop">
<div class="wrap_box">
<div class="three_box">
<div class="or_num">订单号：{{record.orderNo}}</div>
<div class="or_num">联系电话：{{record.contactMobile}}</div>
</div>
<br>
<div style="display: flex; justify-content: space-between;">
<span>操作员工：</span>
<span>{{ record.realName }}</span>
<div class="three_box">
<div class="or_num">挂账单位：{{record.unitName}}</div>
<div class="or_num">操作人：{{ record.realName }}</div>
</div>
<div class="three_box">
<div class="or_num">挂账人：{{record.personCredit}}</div>
<div class="or_num">操作账号：xxxx-xx-xx xx:x</div>
</div>
</div>
<div >
<div style="display: flex; justify-content: space-between;">
<span>挂账单位</span>
<span>{{record.unitName}}</span>
</div>
<div style="display: flex; justify-content: space-between;margin: 10px 0">
<span>挂账人</span>
<span>{{record.personCredit}}</span>
</div>
<div style="display: flex; justify-content: space-between;">
<span>联系电话</span>
<span>{{record.contactMobile}}</span>
</div>
</div>
</el-card>
<el-card style="margin-top: 15px;width: 90%">
</div>
<div style="margin-top: 15px;width: 96%">
<el-table ref="tables"
border
v-loading="loading"
:data="returnRecordList">
<el-table-column label="单据号" align="center" prop="orderNo" width="200"></el-table-column>
@ -240,7 +231,7 @@
</div>
</el-card>
</div>
</div>
</el-drawer>
</div>
@ -577,4 +568,18 @@ import {exportExcelCashierApi, exportExcelHangBillApi} from "@/api/order/exportE
padding: 15px;
height: 85vh;
}
.top_pop{
width: 96%;
}
.wrap_box{
display: flex;
flex-wrap: wrap;
}
.three_box{
width: 33%;
}
.or_num{
font-size: 14px;
margin-bottom: 15px;
}
</style>