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 08:44:57 +08:00
parent 5f5cd9b6dd
commit 2dc6af2040
17 changed files with 40 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fuintAdmin/src/views/financialStatement/buy/list.vue
View File

@ -10,19 +10,13 @@
<buy-goods v-if="activeindex == '3'"></buy-goods>
<buy-inter v-if="activeindex == '4'"></buy-inter>
</div>
</template>
<script>
import BuyOil from "@/views/financialStatement/buy/tab/oil.vue";
import BuyEm from "@/views/financialStatement/buy/tab/em.vue";
import BuyGun from "@/views/financialStatement/buy/tab/gun.vue";
import BuyGoods from "@/views/financialStatement/buy/tab/goods.vue";
import BuyInter from "@/views/financialStatement/buy/tab/inter.vue";
export default {
name: "buy-list",
data() {

6
fuintAdmin/src/views/financialStatement/buy/tab/em.vue
View File

@ -291,7 +291,7 @@ export default {
margin-bottom: 15px;
}
.card-chan{
width: 98%;
width: 99%;
background: #fff;
margin: 10px auto;
@ -347,7 +347,7 @@ export default {
text-transform: none;
}
.wgang{
width: 98%;
width: 99%;
background: #fff;
display: flex;
align-items: center;
@ -365,7 +365,7 @@ export default {
overflow: auto;
}
.wit_box{
width: 98%;
width: 99%;
background: #FFFFFF;
margin: 5px auto;
box-sizing: border-box;

4
fuintAdmin/src/views/financialStatement/buy/tab/goods.vue
View File

@ -347,7 +347,7 @@ export default {
text-transform: none;
}
.wgang{
width: 98%;
width: 99%;
background: #fff;
display: flex;
align-items: center;
@ -365,7 +365,7 @@ export default {
overflow: auto;
}
.wit_box{
width: 98%;
width: 99%;
background: #FFFFFF;
margin: 5px auto;
box-sizing: border-box;

10
fuintAdmin/src/views/financialStatement/buy/tab/gun.vue
View File

@ -1,7 +1,6 @@
<!-- 收银台订单-->
<template>
<div class="container" >
<div class="wgang">
<div style="display: flex;align-items: center ">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px">
@ -91,8 +90,6 @@
</div>
</div>
</div>
<div class="table-box">
<el-table
:data="orderList"
@ -107,9 +104,6 @@
<el-table-column prop="content" align="center" label="退款金额（元）"> </el-table-column>
<el-table-column prop="content" align="center" label="实收金额（元）"> </el-table-column>
<el-table-column prop="content" align="center" label="统计周期"> </el-table-column>
<!-- <div slot="empty" class="empty">-->
<!-- <el-empty description="暂无数据"></el-empty>-->
<!-- </div>-->
</el-table>
</div>
<div class="pagination-box">
@ -347,7 +341,7 @@ export default {
text-transform: none;
}
.wgang{
width: 98%;
width: 99%;
background: #fff;
display: flex;
align-items: center;
@ -365,7 +359,7 @@ export default {
overflow: auto;
}
.wit_box{
width: 98%;
width: 99%;
background: #FFFFFF;
margin: 5px auto;
box-sizing: border-box;

5
fuintAdmin/src/views/financialStatement/buy/tab/inter.vue
View File

@ -107,7 +107,6 @@ import {
getmyDataApi,
getInstituionListApi2
} from "@/api/allOrder";
export default {
name: "runningWater-oilDepot",
data(){
@ -317,7 +316,7 @@ export default {
text-transform: none;
}
.wgang{
width: 98%;
width: 99%;
background: #fff;
display: flex;
align-items: center;
@ -335,7 +334,7 @@ export default {
overflow: auto;
}
.wit_box{
width: 98%;
width: 99%;
background: #FFFFFF;
margin: 5px auto;
box-sizing: border-box;

6
fuintAdmin/src/views/financialStatement/buy/tab/oil.vue
View File

@ -91,8 +91,6 @@
</div>
</div>
</div>
<div class="table-box">
<el-table
:data="orderList"
@ -347,7 +345,7 @@ export default {
text-transform: none;
}
.wgang{
width: 98%;
width: 99%;
background: #fff;
display: flex;
align-items: center;
@ -365,7 +363,7 @@ export default {
overflow: auto;
}
.wit_box{
width: 98%;
width: 99%;
background: #FFFFFF;
margin: 5px auto;
box-sizing: border-box;

3
fuintAdmin/src/views/financialStatement/reconciliation/list.vue
View File

@ -1,5 +1,4 @@
<template>
<div class="container">
<div class="tab-box">
<div class="f-box" v-for="(item,index) in tablist" :key="index" @click="activeindex=index" :class="{ 'active' :activeindex==index}">{{item.name}}</div>
@ -8,8 +7,6 @@
<reconciliation-ref v-if="activeindex == '1' "></reconciliation-ref>
<reconciliation-favourable v-if="activeindex == '2' "></reconciliation-favourable>
</div>
<!-- <reconciliation-time v-if="radio1 == '按时间统计手续费' "></reconciliation-time>-->
<!-- <reconciliation-store v-if="radio1 == '按门店统计手续费' "></reconciliation-store>-->
</template>

9
fuintAdmin/src/views/financialStatement/reconciliation/tab/favourable.vue
View File

@ -533,7 +533,7 @@ export default {
}
.table-box{
width: 100%;
height: 58vh;
height: 54vh;
overflow: auto;
}
.pagination-box{
@ -552,7 +552,7 @@ export default {
margin: 10px 0;
}
.new-top{
width: 98%;
width: 99%;
background: #FFFFFF;
margin: 15px auto;
height: 115px;
@ -560,15 +560,16 @@ export default {
padding: 15px;
border-radius: 4px;
margin-bottom: 5px;
margin-top: 5px;
}
.wit_box{
width: 98%;
width: 99%;
background: #FFFFFF;
margin: 5px auto;
box-sizing: border-box;
padding: 15px;
border-radius: 4px;
height: 74vh;
height: 73vh;
}
</style>

6
fuintAdmin/src/views/financialStatement/reconciliation/tab/ref.vue
View File

@ -551,7 +551,7 @@ export default {
margin: 10px 0;
}
.new-top{
width: 98%;
width: 99%;
background: #FFFFFF;
margin: 15px auto;
height: 115px;
@ -561,13 +561,13 @@ export default {
margin-bottom: 5px;
}
.wit_box{
width: 98%;
width: 99%;
background: #FFFFFF;
margin: 5px auto;
box-sizing: border-box;
padding: 15px;
border-radius: 4px;
height: 74vh;
height: 72vh;
}
</style>

21
fuintAdmin/src/views/financialStatement/reconciliation/tab/trading.vue
View File

@ -235,8 +235,8 @@
<el-table-column prop="mchntCd" align="center" label="商户号"></el-table-column>
<el-table-column prop="createBy" align="center" label="关联员工"></el-table-column>
<el-table-column prop="createTime" align="center" label="订单创建时间" width="220"></el-table-column>
<el-table-column prop="updateTime" align="center" label="订单完成时间" width="220"></el-table-column>
<el-table-column prop="createTime" align="center" label="订单创建时间" ></el-table-column>
<el-table-column prop="updateTime" align="center" label="订单完成时间"></el-table-column>
</el-table>
</div>
<pagination
@ -474,11 +474,8 @@ export default {
}
.box {
//box-sizing: border-box;
padding: 5px;
//background: #f9f9f9;
padding-left: 20px;
width: 211px;
height: 60px;
background: #fff;
@ -539,16 +536,11 @@ export default {
}
.size-bole {
//font-weight: bold;
//width: 53px;
height: 31px;
//font-family: YouSheBiaoTiHei;
font-size: 24px;
color: #0DC291;
font-weight: 600;
font-size: 24px;
//line-height: 0px;
text-align: left;
font-style: normal;
text-transform: none;
@ -568,8 +560,9 @@ export default {
.table-box {
width: 100%;
height: 58vh;
height: 56vh;
overflow: auto;
scrollbar-width: none;
}
.pagination-box {
@ -591,7 +584,7 @@ export default {
}
.new-top {
width: 98%;
width: 99%;
background: #FFFFFF;
margin: 15px auto;
height: 115px;
@ -602,13 +595,13 @@ export default {
}
.wit_box {
width: 98%;
width: 99%;
background: #FFFFFF;
margin: 5px auto;
box-sizing: border-box;
padding: 15px;
border-radius: 4px;
height: 74vh;
height: 73vh;
}
</style>

4
fuintAdmin/src/views/financialStatement/runningWater/tab/day.vue
View File

@ -359,7 +359,7 @@ export default {
text-transform: none;
}
.wgang{
width: 98%;
width: 99%;
background: #fff;
display: flex;
align-items: center;
@ -377,7 +377,7 @@ export default {
overflow: auto;
}
.wit_box{
width: 98%;
width: 99%;
background: #FFFFFF;
margin: 5px auto;
box-sizing: border-box;

7
fuintAdmin/src/views/financialStatement/runningWater/tab/none.vue
View File

@ -17,13 +17,6 @@
<el-table-column prop="leaderPhone" align="center" label="联系电话"> </el-table-column>
<!-- <el-table-column prop="parentStoreId" align="center" label="机构编号"> </el-table-column>-->
<el-table-column prop="parentStoreName" align="center" label="机构名称"> </el-table-column>
<!-- <el-table-column prop="leaderName" align="center" label="业务员"> </el-table-column>-->
<!-- <el-table-column prop="leaderPhone" align="center" label="业务员联系电话"> </el-table-column>-->
<!-- <el-table-column prop="seekZero" align="center" label="品牌编号"> </el-table-column>-->
<!-- <el-table-column prop="seekZero" align="center" label="品牌名称"> </el-table-column>-->
<!-- <el-table-column prop="seekZero" align="center" label="省"> </el-table-column>-->
<!-- <el-table-column prop="seekZero" align="center" label="市"> </el-table-column>-->
<!-- <el-table-column prop="seekZero" align="center" label="区"> </el-table-column>-->
<el-table-column prop="addr" align="center" label="地址"> </el-table-column>
<el-table-column prop="createTime" align="center" label="创建日期"> </el-table-column>
</el-table>

4
fuintAdmin/src/views/financialStatement/runningWater/tab/oilDepot.vue
View File

@ -345,7 +345,7 @@ import {
text-transform: none;
}
.wgang{
width: 98%;
width: 99%;
background: #fff;
display: flex;
align-items: center;
@ -363,7 +363,7 @@ import {
overflow: auto;
}
.wit_box{
width: 98%;
width: 99%;
background: #FFFFFF;
margin: 5px auto;
box-sizing: border-box;

1
fuintAdmin/src/views/fleet/tab/fleetInfo.vue
View File

@ -479,6 +479,7 @@ export default {
width: 100%;
height: 73.5vh;
overflow: auto;
scrollbar-width: none;
}
.wrap-boxs {

1
fuintAdmin/src/views/member/index.vue
View File

@ -576,7 +576,6 @@
<div slot="footer" class="dialog-footer">
<el-button @click="cancel">取 消</el-button>
<el-button type="primary" @click="submitForm">确 定</el-button>
</div>
</el-dialog>

28
fuintAdmin_zt/src/views/Site/add.vue
View File

@ -321,7 +321,6 @@ export default {
<div class="container">
<el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="110px">
<div class="top-box">
<!-- <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px" class="demo-ruleForm">-->
<div>
<el-form-item label="角色名称" prop="roleName">
<el-input v-model="ruleForm.roleName"></el-input>
@ -358,22 +357,11 @@ export default {
</div>
<div class="center-box">
<div>
<!-- <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="110px" class="demo-ruleForm">-->
<!-- <el-form-item label="角色登录权限" prop="roleCode">-->
<!-- <el-radio-group v-model="ruleForm.roleCode">-->
<!-- <el-radio :label="0">都无</el-radio>-->
<!-- <el-radio :label="1">后台</el-radio>-->
<!-- <el-radio :label="2">收银台</el-radio>-->
<!-- <el-radio :label="3">全部</el-radio>-->
<!-- </el-radio-group>-->
<!-- </el-form-item>-->
<el-form-item label="菜单功能权限">
<el-checkbox v-model="checked" @change="chooseAllOrNo">全选</el-checkbox>
<el-checkbox v-model="isOpen" @change="openTable">展开</el-checkbox>
</el-form-item>
<!-- </el-form>-->
<!-- <el-button size="mini" @click.native="openTable('open')">一键展开</el-button>-->
<!-- <el-button size="mini" @click.native="openTable('fold')">折叠</el-button>-->
</div>
<el-table
ref="table"
@ -409,7 +397,7 @@ export default {
</template>
</el-table-column>
</el-table>
<div style="display: flex">
<div style="display: flex;justify-content: center">
<el-button @click="resetForm('ruleForm')">取消</el-button>
<el-button type="primary" @click="submitForm('ruleForm')">保存</el-button>
@ -425,7 +413,7 @@ export default {
.container {
width: 100%;
box-sizing: border-box;
padding: 20px;
padding: 10px;
background: #f4f5f9;
}
@ -440,21 +428,17 @@ export default {
font-size: 14px;
color: #999;
padding-left: 25px;
}
.demo-ruleForm {
border-radius: 10px ;
}
.center-box {
width: 100%;
box-sizing: border-box;
padding: 20px;
background: #FFFFFF;
box-shadow: 0px 3px 6px 1px rgba(255, 255, 255, 0.4), inset 0px 3px 6px 1px rgba(255, 255, 255, 0.5);
border-radius: 10px 10px 10px 10px;
margin-top: 20px;
border-radius: 10px ;
margin-top: 10px;
}
.f-box {

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

@ -625,9 +625,9 @@
<!-- 添加或修改用户配置对话框 class="common-dialog" -->
<el-dialog :title="title" :visible.sync="open" width="600px" append-to-body :close-on-click-modal="false" >
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-row>
<el-col :span="24">
<el-form-item label="所属机构" prop="deptId">
@ -2248,6 +2248,7 @@ export default {
margin-right: 50px;
display: flex;
align-items: center;
cursor: pointer;
}
.active{