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

11.1

Browse Source
This commit is contained in:
DESKTOP-369JRHT\12997 2024-11-01 10:37:08 +08:00
parent 79e8720550
commit cf6755b3c8
10 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fuintAdmin/src/layout/components/AppMain.vue
View File

@ -53,7 +53,7 @@ export default {
// fix css style bug in open el-dialog // fix css style bug in open el-dialog
.el-popup-parent--hidden { .el-popup-parent--hidden {
.fixed-header { .fixed-header {
padding-right: 17px; //padding-right: 17px;
} }
} }
</style> </style>

2
fuintAdmin/src/views/convenienceStore/goodsSale.vue
View File

@ -91,7 +91,7 @@
direction="rtl" direction="rtl"
size="60%"> size="60%">
<div style="width: 96%;margin: 0 auto"> <div style="width: 96%;margin: 0 auto">
<div style="display: flex;margin-bottom: 20px"> <div style="display: flex;margin-bottom: 20px;color: #606266;font-size: 14px">
<div>商品名称：{{goodsInfo.name || 0}}</div> <div>商品名称：{{goodsInfo.name || 0}}</div>
<div style="margin: 0 50px">品类名称：{{goodsInfo.pinLeiName || 0}}</div> <div style="margin: 0 50px">品类名称：{{goodsInfo.pinLeiName || 0}}</div>
<div>销售总额：{{goodsInfo.saleTotal || 0}}</div> <div>销售总额：{{goodsInfo.saleTotal || 0}}</div>

3
fuintAdmin/src/views/convenienceStore/purchase/purchase.vue
View File

@ -52,7 +52,7 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
<div style="height: 71vh;overflow: auto"> <div style="height: 71vh;overflow: auto;scrollbar-width: none">
<el-table ref="tables" border <el-table ref="tables" border
v-loading="loading" v-loading="loading"
:data="purchaseList" :data="purchaseList"
@ -62,7 +62,6 @@
<el-table-column label="供应商" align="center" prop="supplierName"/> <el-table-column label="供应商" align="center" prop="supplierName"/>
<el-table-column label="商品数量" align="center" prop="productQuantity"/> <el-table-column label="商品数量" align="center" prop="productQuantity"/>
<el-table-column label="单据金额" align="center" prop="totalAmount"/> <el-table-column label="单据金额" align="center" prop="totalAmount"/>
<el-table-column label="状态" align="center" prop="status"> <el-table-column label="状态" align="center" prop="status">
<template slot-scope="scope"> <template slot-scope="scope">
<div slot="reference" class="name-wrapper"> <div slot="reference" class="name-wrapper">

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

@ -490,7 +490,7 @@ export default {
.table-box { .table-box {
width: 100%; width: 100%;
height: 82vh; height: 78vh;
overflow: auto; overflow: auto;
} }

2
fuintAdmin_zt/src/layout/components/AppMain.vue
View File

@ -52,7 +52,7 @@ export default {
// fix css style bug in open el-dialog // fix css style bug in open el-dialog
.el-popup-parent--hidden { .el-popup-parent--hidden {
.fixed-header { .fixed-header {
padding-right: 17px; //padding-right: 17px;
} }
} }
</style> </style>

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

@ -1,11 +1,9 @@
<template> <template>
<div class="app-container" style="padding: 0px"> <div class="app-container" style="padding: 10px">
<div class="tab-box"> <div class="tab-box">
<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: 20px">
<el-col :span="6"> <el-col :span="6">
<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">

2
fuintAdmin_zt/src/views/system/notify/page/mode.vue
View File

@ -1,5 +1,5 @@
<template> <template>
<div class="app-container"> <div class="app-container" style="padding: 10px">
<div class="card-change" style="min-height: 80vh;"> <div class="card-change" style="min-height: 80vh;">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
<el-form-item label="" prop="notificationName"> <el-form-item label="" prop="notificationName">

3
fuintAdmin_zt/src/views/system/notify/page/record.vue
View File

@ -1,5 +1,5 @@
<template> <template>
<div class="app-container"> <div class="app-container" style="padding: 10px">
<div class="card-change" style="min-height: 80vh;"> <div class="card-change" style="min-height: 80vh;">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
<el-form-item label="" prop="deptName"> <el-form-item label="" prop="deptName">
@ -107,7 +107,6 @@
/> />
</div> </div>
<el-dialog :title="title" :close-on-click-modal="false" :visible.sync="open" width="27%" append-to-body> <el-dialog :title="title" :close-on-click-modal="false" :visible.sync="open" width="27%" append-to-body>
<el-form ref="form" :model="form" label-width="120px" :rules="rules" > <el-form ref="form" :model="form" label-width="120px" :rules="rules" >
<!-- 通知名称 --> <!-- 通知名称 -->

2
fuintCashierWeb/src/layout/components/AppMain.vue
View File

@ -51,7 +51,7 @@ export default {
// fix css style bug in open el-dialog // fix css style bug in open el-dialog
.el-popup-parent--hidden { .el-popup-parent--hidden {
.fixed-header { .fixed-header {
padding-right: 17px; //padding-right: 17px;
} }
} }
</style> </style>

2
pos-uni/uni_modules/uview-ui/libs/config/zIndex.js
View File

@ -13,7 +13,7 @@ export default {
// popup包含popup，actionsheet，keyboard，picker的值 // popup包含popup，actionsheet，keyboard，picker的值
popup: 10075, popup: 10075,
mask: 10070, mask: 10070,
navbar: 980, : 980,
topTips: 975, topTips: 975,
sticky: 970, sticky: 970,
indexListSticky: 965 indexListSticky: 965