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

11.15

Browse Source
This commit is contained in:
DESKTOP-369JRHT\12997 2024-11-15 08:49:37 +08:00
parent 499c40f13b
commit 75efe3f5fa
10 changed files with 47 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fuintAdmin/src/views/handover/HandoverRecord.vue
View File

@ -154,7 +154,7 @@ export default {
<div class="table-s"> <div class="table-s">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="100px"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="100px">
<el-form-item label="" prop="status"> <el-form-item label="" prop="status">
<el-select v-model="queryParams.status" style="width: 150px" placeholder="交班方式" clearable> <el-select v-model="queryParams.status" style="width: 150px" placeholder="交班方式1" clearable>
<el-option label="统一交班" value="统一交班">统一交班</el-option> <el-option label="统一交班" value="统一交班">统一交班</el-option>
<el-option label="个人交班" value="个人交班">个人交班</el-option> <el-option label="个人交班" value="个人交班">个人交班</el-option>
</el-select> </el-select>

30
fuintAdmin_zt/src/layout/components/Navbar.vue
View File

@ -10,17 +10,7 @@
</div> </div>
</div> </div>
<!-- <breadcrumb id="breadcrumb-container" class="breadcrumb-container" v-if="!topNav"/>-->
<!-- <top-nav id="topmenu-container" class="topmenu-container" v-if="topNav"/>-->
<div class="right-menu"> <div class="right-menu">
<!-- <template v-if="device!=='mobile'">-->
<!-- <search id="header-search" class="right-menu-item" />-->
<!-- <screenfull id="screenfull" class="right-menu-item hover-effect" />-->
<!-- <FuintDoc id="fuint-doc" class="right-menu-item hover-effect" />-->
<!-- </template>-->
<div class="d-s"style="margin-right: 20px"> <div class="d-s"style="margin-right: 20px">
<img src="../../assets/images/qp.png" style="width: 28px;height: 28px;margin-right: 5px"> <img src="../../assets/images/qp.png" style="width: 28px;height: 28px;margin-right: 5px">
<div>全屏</div> <div>全屏</div>
@ -112,14 +102,7 @@ export default {
}, },
deptName:'', deptName:'',
rules:{ rules:{
// password: [
// { required: true, message: '请输入密码', trigger: 'blur' },
// { min: 3, max: 15, message: '长度在 3 到 15 个字符', trigger: 'blur' }
// ],
// passwords: [
// { required: true, message: '请输入新密码', trigger: 'blur' },
// { min: 3, max: 15, message: '长度在 3 到 15 个字符', trigger: 'blur' }
// ],
password: [ password: [
{ required: true, message: '请输入新密码', trigger: 'blur' }, { required: true, message: '请输入新密码', trigger: 'blur' },
{ min: 3, max: 15, message: '长度在 3 到 15 个字符', trigger: 'blur' }, { min: 3, max: 15, message: '长度在 3 到 15 个字符', trigger: 'blur' },
@ -257,16 +240,12 @@ export default {
.navbar { .navbar {
height: 90px; height: 90px;
overflow: hidden; overflow: hidden;
//position: relative;
background: white; background: white;
//background-image: url("../../assets/images/kkx.png") ;
background-size: 100% 100%; background-size: 100% 100%;
background-size: cover; background-size: cover;
background-repeat: no-repeat; background-repeat: no-repeat;
box-shadow: 0 1px 4px rgba(0,21,41,.08);
box-sizing: border-box; box-sizing: border-box;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
.hamburger-container { .hamburger-container {
@ -283,11 +262,6 @@ export default {
} }
} }
.title-logo{ .title-logo{
//position: absolute;
//top: 50%; /* 将元素垂直向上移动容器高度的50% */
//left: 5%; /* 将元素水平向左移动容器宽度的50% */
//transform: translate(-50%, -50%); /* 通过移动元素的左上角使其居中 */
//color: #ffffff;
font-size: 24px; font-size: 24px;
font-weight: bold; font-weight: bold;
display: flex; display: flex;

8
fuintAdmin_zt/src/views/Site/index.vue
View File

@ -4,7 +4,7 @@
<div class="f-box" v-for="(item,index) in tablist" :key="index" @click="handleClick1(index)" :class="{ 'active' :activeindex==index}">{{item.name}}</div> <div class="f-box" v-for="(item,index) in tablist" :key="index" @click="handleClick1(index)" :class="{ 'active' :activeindex==index}">{{item.name}}</div>
</div> </div>
<el-row style="padding: 10px"> <el-row style="padding: 10px">
<el-col :span="6"> <el-col :span="5">
<el-card style="margin-right: 5px; border: none;box-shadow: none;" shadow="never"> <el-card style="margin-right: 5px; border: none;box-shadow: none;" shadow="never">
<div class="left-box"> <div class="left-box">
<div class="title-h">组织架构</div> <div class="title-h">组织架构</div>
@ -32,12 +32,8 @@
</div> </div>
</el-card> </el-card>
</el-col> </el-col>
<el-col :span="19">
<el-col :span="18">
<el-card style="border: none;box-shadow: none;height: 84.2vh;overflow: auto" shadow="never"> <el-card style="border: none;box-shadow: none;height: 84.2vh;overflow: auto" shadow="never">
<!-- <el-tabs v-model="activeName" @tab-click="handleClick">-->
<!-- 用户信息 -->
<!-- <el-tab-pane label="用户信息" name="list">-->
<template v-if="activeindex == 1"> <template v-if="activeindex == 1">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
label-width="68px"> label-width="68px">

4
fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/vip.vue
View File

@ -1,6 +1,6 @@
<!-- 收银台订单--> <!-- 收银台订单-->
<template> <template>
<div style="background: #f6f8f9;width: 100%;padding: 20px;" > <div style="background: #f6f8f9;width: 100%;padding: 10px;" >
<div class="card-change"> <div class="card-change">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px">
<el-form-item label="" prop="deptId" style="width: 180px"> <el-form-item label="" prop="deptId" style="width: 180px">
@ -277,7 +277,7 @@ import {getRunningWaterByTissueApi} from "@/api/allOrder";
.table-box{ .table-box{
width: 100%; width: 100%;
height: 66vh; height: 74vh;
min-height: 650px; min-height: 650px;
overflow: auto; overflow: auto;
} }

12
fuintAdmin_zt/src/views/homeComponents/agent.vue
View File

@ -137,7 +137,7 @@
</el-popover> </el-popover>
</div> </div>
</div> </div>
<div style="height: 90%;overflow:auto;"> <div style="height: 90%;overflow:auto; scrollbar-width: none">
<div class="d-s" style="margin: 30px 0px" v-for="(item,index) in hardwareList" :key="index" > <div class="d-s" style="margin: 30px 0px" v-for="(item,index) in hardwareList" :key="index" >
<!-- <div class="r-img">--> <!-- <div class="r-img">-->
<!-- <img src="../../assets/images/pcin.png" style="width: 84px;height: 70px">--> <!-- <img src="../../assets/images/pcin.png" style="width: 84px;height: 70px">-->
@ -696,6 +696,7 @@ export default {
height: 100%; height: 100%;
/* height: 100vh; */ /* height: 100vh; */
background: #f4f5f9; background: #f4f5f9;
padding: 10px;
} }
.d-s{ .d-s{
display: flex; display: flex;
@ -717,10 +718,10 @@ export default {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
margin-top: 20px; margin-top: 10px;
} }
.left-box{ .left-box{
width: 73%; width: 73.5%;
background: #FFFFFF; background: #FFFFFF;
border-radius: 10px 10px 10px 10px; border-radius: 10px 10px 10px 10px;
border: 1px solid #FFFFFF; border: 1px solid #FFFFFF;
@ -730,9 +731,10 @@ export default {
justify-content: space-between; justify-content: space-between;
box-sizing: border-box; box-sizing: border-box;
padding: 15px; padding: 15px;
scrollbar-width: none;
} }
.left-box-t{ .left-box-t{
width: 73%; width: 73.5%;
box-sizing: border-box; box-sizing: border-box;
padding: 15px; padding: 15px;
border-radius: 8px; border-radius: 8px;
@ -867,7 +869,7 @@ export default {
background: #fff; background: #fff;
box-sizing: border-box; box-sizing: border-box;
padding: 20px; padding: 20px;
margin-top: 20px; margin-top: 10px;
} }
.anniu-h{ .anniu-h{
width: 80px; width: 80px;

31
fuintAdmin_zt/src/views/notificationList/index.vue
View File

@ -29,20 +29,18 @@
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button> <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
<!-- </el-card>--> <div style="height: 69vh;">
<!-- &lt;!&ndash; &ndash;&gt;--> <el-table :data="tableData" style="width: 100%" border>
<!-- &lt;!&ndash; 列表信息&ndash;&gt;--> <el-table-column align="center" type="index" label="序号"></el-table-column>
<!-- <el-card style="margin-top: 20px" >--> <el-table-column align="center" prop="notificationName" label="通知名称"></el-table-column>
<el-table :data="tableData" style="width: 100%" border> <el-table-column align="center" prop="notificationType" label="通知类型"></el-table-column>
<el-table-column align="center" type="index" label="序号"></el-table-column> <el-table-column align="center" prop="templateContent" label="通知内容"></el-table-column>
<el-table-column align="center" prop="notificationName" label="通知名称"></el-table-column> <el-table-column align="center" prop="createName" label="创建人"></el-table-column>
<el-table-column align="center" prop="notificationType" label="通知类型"></el-table-column> <el-table-column align="center" prop="createTime" label="创建时间"></el-table-column>
<el-table-column align="center" prop="templateContent" label="通知内容"></el-table-column> <el-table-column align="center" prop="createTime" label="发送时间"></el-table-column>
<!-- <el-table-column align="center" prop="sendStatus" label="通知状态"></el-table-column>--> </el-table>
<el-table-column align="center" prop="createName" label="创建人"></el-table-column> </div>
<el-table-column align="center" prop="createTime" label="创建时间"></el-table-column>
<el-table-column align="center" prop="createTime" label="发送时间"></el-table-column>
</el-table>
<pagination <pagination
v-show="total>0" v-show="total>0"
:total="total" :total="total"
@ -315,6 +313,11 @@ export default {
}; };
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.app-container{
box-sizing: border-box;
padding: 10px;
padding-bottom: 0px;
}
.common-dialog >>> .el-upload--picture-card { .common-dialog >>> .el-upload--picture-card {
width: 60px; width: 60px;
height: 50px; height: 50px;

6
fuintCashierWeb/src/views/cashier/NewComponents/Handover.vue
View File

@ -10,7 +10,7 @@
</div> </div>
<div v-if="tabindex == 0"> <div v-if="tabindex == 0">
<div class="card-box" <div class="card-box"
style="width: 98%;margin: 10px auto;background: #fff;box-sizing: border-box;padding-top: 15px" style="width: 99%;margin: 10px auto;background: #fff;box-sizing: border-box;padding-top: 15px"
> >
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="100px"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="100px">
<el-form-item label="" prop="status"> <el-form-item label="" prop="status">
@ -109,7 +109,7 @@
<div>{{ orderSummary.memberPoints }}</div> <div>{{ orderSummary.memberPoints }}</div>
</div> </div>
<div class="xxing"></div> <div class="xxing"></div>
<div style="overflow: auto; height: 32vh;scrollbar-width: none; "> <div style="overflow: auto; height: 35vh;scrollbar-width: none; ">
<div class="for-box"> <div class="for-box">
<div class="for-title"> <div class="for-title">
<div class="x-"></div> <div class="x-"></div>
@ -358,7 +358,7 @@
</div> </div>
</div> </div>
<div <div
style="width: 98%; margin: 10px auto;display: flex;align-items: center;justify-content: center; background: #fff;box-sizing: border-box;padding: 15px " style="width: 99%; margin: 10px auto;display: flex;align-items: center;justify-content: center; background: #fff;box-sizing: border-box;padding: 15px "
> >
<el-button type="primary" @click="shift()">交班</el-button> <el-button type="primary" @click="shift()">交班</el-button>
</div> </div>

7
fuintCashierWeb/src/views/cashier/NewComponents/HandoverRecord.vue
View File

@ -281,12 +281,13 @@ export default {
} }
.wit-box{ .wit-box{
height: 92vh; height: 93vh;
width: 98%; width: 99%;
margin: 15px auto; margin: 10px auto;
background: #fff; background: #fff;
border-radius: 8px; border-radius: 8px;
padding: 10px; padding: 10px;
margin-bottom: 0px;
box-sizing: border-box; box-sizing: border-box;
} }
</style> </style>

11
fuintCashierWeb/src/views/cashier/NewComponents/Integral.vue
View File

@ -129,7 +129,7 @@
<div class="center-right"> <div class="center-right">
<div class="center-right-top" style="margin-left: 25px;"> <div class="center-right-top" style="margin-left: 25px;">
<el-tabs v-model="queryParams.categoryId" style="width: 100%" @tab-click="handleClick"> <el-tabs v-model="queryParams.categoryId" style="width: 100%" @tab-click="handleClick">
<el-tab-pane label="全部" name="first"></el-tab-pane>
<el-tab-pane v-for="(item,index) in giftCategoryList" :label="item.categoryName" :name="item.id.toString()" <el-tab-pane v-for="(item,index) in giftCategoryList" :label="item.categoryName" :name="item.id.toString()"
></el-tab-pane> ></el-tab-pane>
</el-tabs> </el-tabs>
@ -527,6 +527,13 @@ export default {
getGiftCategory() { getGiftCategory() {
getGiftCategoryApi().then(res => { getGiftCategoryApi().then(res => {
this.giftCategoryList = res.data.records this.giftCategoryList = res.data.records
let data = {
categoryName:'全部',
id:0
}
this.giftCategoryList.splice(0,0,data)
console.log(this.giftCategoryList,'12321')
}) })
}, },
// 获取支付方式 // 获取支付方式
@ -1273,7 +1280,7 @@ export default {
display: flex; display: flex;
box-sizing: border-box; box-sizing: border-box;
padding: 10px; padding: 10px;
padding-top: 20px;
height: 100vh; height: 100vh;
justify-content: space-between; justify-content: space-between;
} }

13
fuintCashierWeb/src/views/cashier/index.vue
View File

@ -5,9 +5,6 @@
<div class="app-left"> <div class="app-left">
<div class="app-left-top"> <div class="app-left-top">
<img src="../../assets/logo/logo_syt.png" style="width: 167px;height: 16px;"> <img src="../../assets/logo/logo_syt.png" style="width: 167px;height: 16px;">
<!-- <div class="app-left-title">-->
<!-- -->
<!-- </div>-->
</div> </div>
<div class="app-left-box" v-for="(item,index) in tabarr" v-if="item.name !== '积分'" :class="{'bule': leftindex == item.index1}" :key="index" @click="gocomponents(index,item.path)"> <div class="app-left-box" v-for="(item,index) in tabarr" v-if="item.name !== '积分'" :class="{'bule': leftindex == item.index1}" :key="index" @click="gocomponents(index,item.path)">
<i :class="item.icon" style="font-size: 18px" ></i> <div style="cursor: pointer;margin-left: 10px">{{item.name}}</div> <i :class="item.icon" style="font-size: 18px" ></i> <div style="cursor: pointer;margin-left: 10px">{{item.name}}</div>
@ -16,17 +13,7 @@
<div class="app-left-box" @click="isClickMethod()" :class="{'bule': leftindex == item.index1 }"> <div class="app-left-box" @click="isClickMethod()" :class="{'bule': leftindex == item.index1 }">
<i :class="item.icon" style="font-size: 18px" ></i> <div style="cursor: pointer;margin-left: 10px">{{item.name}}</div> <i :class="item.icon" style="font-size: 18px" ></i> <div style="cursor: pointer;margin-left: 10px">{{item.name}}</div>
</div> </div>
<!-- <transition name="el-zoom-in-top">-->
<el-collapse-transition> <el-collapse-transition>
<!-- <div v-if="isClick">-->
<!-- <div class="app-left-box" @click="gocomponents(5,'/Integral')">-->
<!-- <div style="cursor: pointer;margin-left: 10px">积分商城</div>-->
<!-- </div>-->
<!-- <div class="app-left-box" @click="gocomponents(5,'/IntegralOrder')">-->
<!-- <div style="cursor: pointer;margin-left: 10px">积分订单</div>-->
<!-- </div>-->
<!-- </div>-->
</el-collapse-transition> </el-collapse-transition>
</div> </div>
<div class="app-left-box" @click="logout"> <div class="app-left-box" @click="logout">