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

样式修改

Browse Source
This commit is contained in:
DESKTOP-369JRHT\12997 2024-07-31 15:21:49 +08:00
parent a3911e9454
commit 20ef58f136
27 changed files with 94 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
fuintAdmin/src/views/convenienceStore/inventory/details.vue
View File

@ -471,15 +471,17 @@ export default {
change(data,flag) {
let profitLossAmount = new BigNumber(data.profitLossAmount);
let inventoryDiscrepancy = new BigNumber(data.inventoryDiscrepancy);
let inventoryQuantity = new BigNumber(data.inventoryQuantity);
let damageQuantity = new BigNumber(data.damageQuantity);
let inventoryQuantity = new BigNumber(data.inventoryQuantity); //正常
let damageQuantity = new BigNumber(data.damageQuantity); //货损
let purchasePrice = new BigNumber(data.purchasePrice);
let stock = new BigNumber(data.stock);
// 计算库存差异
let addStocke = inventoryQuantity.minus(damageQuantity)
console.log("inventoryQuantity",inventoryQuantity)
console.log("damageQuantity",damageQuantity)
console.log("stock",stock)
let addStocke = inventoryQuantity.minus(damageQuantity) // 正常减货损
// let addStocke = inventoryQuantity.plus(damageQuantity)
inventoryDiscrepancy = addStocke.minus(stock)
inventoryDiscrepancy = addStocke.minus(stock) //
// 计算盈亏金额
profitLossAmount = inventoryDiscrepancy.multipliedBy(purchasePrice);
data.inventoryDiscrepancy = inventoryDiscrepancy.toNumber();

8
fuintAdmin_zt/src/assets/styles/index.scss
View File

@ -124,6 +124,14 @@ aside {
padding: 20px;
}
.card-change {
padding: 20px;
//width: 80% !important;
background: #ffffff;
border-radius: 4px;
min-height: 600px;
}
.components-container {
margin: 30px 50px;
position: relative;

4
fuintAdmin_zt/src/views/Service/index.vue
View File

@ -1,6 +1,6 @@
<template>
<div class="app-container">
<el-card >
<div class="card-change">
<div class="top-box">
<div class="d-s">
<el-input v-model="queryParams.name" placeholder="请输入油站名称" style="width: 200px;margin-right: 15px;"></el-input>
@ -165,7 +165,7 @@
@pagination="getStoreList"
/>
</el-card>
</div>
<!-- <el-card style="margin-top: 20px" v-for="(item,index) in arrlist" :key="index">-->
<!-- <div slot="header" class="clearfix">-->

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

@ -7,7 +7,7 @@
<el-row style="padding: 20px">
<el-col :span="6">
<el-card style="margin-right: 5px">
<el-card style="margin-right: 5px; border: none;box-shadow: none;" shadow="never">
<div class="left-box">
<div class="title-h">组织架构</div>
@ -36,7 +36,8 @@
</el-col>
<el-col :span="18">
<el-card style="margin-bottom: 20px;">
<el-card style="margin-bottom: 20px;border: none;
box-shadow: none;" shadow="never">
<!-- <el-tabs v-model="activeName" @tab-click="handleClick">-->
<!-- 用户信息 -->
<!-- <el-tab-pane label="用户信息" name="list">-->

8
fuintAdmin_zt/src/views/financialStatement/dai_yunyingfenxi/tab/paym.vue
View File

@ -1,7 +1,7 @@
<!-- 收银台订单-->
<template>
<div style="margin-top: 0px;margin-right: 40px">
<el-card class="box-card" style="margin-top: 0px;">
<div style="padding-top: 20px; padding-right: 40px; background: #f6f8f9;">
<el-card class="box-card" style="margin-top: 0px;" shadow="never">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px" >
<div class="d-s" style="margin-bottom: 15px;justify-content: space-between">
<div class="d-s">
@ -51,7 +51,7 @@
</div>
</div>
</el-card>
<el-card class="box-card">
<el-card class="box-card" style="min-height: 500px;" shadow="never">
<div class="table-box">
<el-table
:data="orderList"
@ -333,6 +333,8 @@ export default {
.box-card {
width: 100%;
margin: 0px 20px 20px 20px;
border: none;
box-shadow: none;
}
.el-form--inline .el-form-item {

8
fuintAdmin_zt/src/views/financialStatement/dai_yunyingfenxi/tab/paytype.vue
View File

@ -1,7 +1,7 @@
<!-- 收银台订单-->
<template>
<div style="margin-top: 0px;margin-right: 40px">
<el-card class="box-card">
<div style="padding-top: 20px; padding-right: 40px; background: #f6f8f9;">
<el-card class="box-card" shadow="never">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px">
<div class="d-s" style="justify-content: space-between">
<div class="d-s">
@ -62,7 +62,7 @@
</div>
</div>
</el-card>
<el-card class="box-card">
<el-card class="box-card" style="min-height: 500px;" shadow="never">
<div class="table-box">
<el-table
:data="orderList"
@ -300,6 +300,8 @@ export default {
.box-card {
width: 100%;
margin: 0px 20px 20px 20px;
border: none;
box-shadow: none;
}
.el-form--inline .el-form-item {

2
fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/list.vue
View File

@ -84,7 +84,7 @@ export default {
.app-top{
width: 100%;
//margin-bottom: 20px;
height: 60px;
//height: 60px;
box-sizing: border-box;
}

6
fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/int.vue
View File

@ -1,7 +1,7 @@
<!-- 收银台订单-->
<template>
<div style="margin-top: 0px;margin-right: 40px">
<el-card class="box-card">
<div style="background: #f6f8f9;width: 100%;padding: 20px;height: 100vh">
<div class="card-change">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px">
<el-form-item label="" prop="deptId" style="width: 180px">
<el-select
@ -140,7 +140,7 @@
@pagination="getList"
/>
</el-card>
</div>
</div>
</template>

6
fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/oil.vue
View File

@ -1,7 +1,7 @@
<!-- 收银台订单-->
<template>
<div style="margin-top: 0px;margin-right: 40px">
<el-card class="box-card">
<div style="background: #f6f8f9;width: 100%;padding: 20px;height: 100vh">
<div class="card-change">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px">
<el-form-item label="" prop="deptId" style="width: 180px">
<el-select
@ -136,7 +136,7 @@
@pagination="getList"
/>
</el-card>
</div>
</div>
</template>

6
fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/store.vue
View File

@ -1,7 +1,7 @@
<!-- 收银台订单-->
<template>
<div style="margin-top: 0px;margin-right: 40px">
<el-card class="box-card">
<div style="background: #f6f8f9;width: 100%;padding: 20px;height: 100vh">
<div class="card-change">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px">
<el-form-item label="" prop="deptId" style="width: 180px">
<el-select
@ -134,7 +134,7 @@
@pagination="getList"
/>
</el-card>
</div>
</div>
</template>

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

@ -1,7 +1,7 @@
<!-- 收银台订单-->
<template>
<div style="margin-top: 0px;margin-right: 40px">
<el-card class="box-card">
<div style="background: #f6f8f9;width: 100%;padding: 20px;height: 100vh" >
<div class="card-change">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px">
<el-form-item label="" prop="deptId" style="width: 180px">
<el-select
@ -152,7 +152,7 @@
@pagination="getList"
/>
</el-card>
</div>
</div>
</template>
@ -266,8 +266,8 @@ import {getRunningWaterByTissueApi} from "@/api/allOrder";
<style scoped>
.box-card{
width: 100%;
margin: 0px 20px 20px 20px;
//width: 100%;
//margin: 0px 20px 20px 20px;
}
.el-form--inline .el-form-item {

2
fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/list.vue
View File

@ -103,7 +103,7 @@ export default {
.app-top{
width: 100%;
//margin-bottom: 20px;
height: 60px;
//height: 60px;
box-sizing: border-box;
}

8
fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/int.vue
View File

@ -1,7 +1,7 @@
<!-- 收银台订单-->
<template>
<div style="margin-top: 0px;margin-right: 40px">
<el-card class="box-card">
<div style="padding-top: 20px; padding-right: 40px; background: #f6f8f9;">
<el-card class="box-card" shadow="never">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px">
<div class="d-s" style="justify-content: space-between;width: 100%">
<div class="d-s">
@ -58,7 +58,7 @@
</div>
</div>
</el-card>
<el-card class="box-card">
<el-card class="box-card" style="min-height: 500px;" shadow="never">
<div class="table-box">
<el-table
:data="orderList"
@ -288,6 +288,8 @@ export default {
.box-card {
width: 100%;
margin: 0px 20px 20px 20px;
border: none;
box-shadow: none;
}
.el-form--inline .el-form-item {

11
fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/oil.vue
View File

@ -1,7 +1,7 @@
<!-- 收银台订单-->
<template>
<div style="margin-top: 0px; margin-right: 40px">
<el-card class="box-card">
<div style="padding-top: 20px; padding-right: 40px; background: #f6f8f9;">
<el-card class="box-card" shadow="never">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px">
<div class="d-s" style="justify-content: space-between;width: 100%">
<div class="d-s">
@ -68,12 +68,13 @@
</div>
</div>
</el-card>
<el-card class="box-card">
<el-card class="box-card" style="min-height: 500px;" shadow="never">
<div class="table-box">
<div class="table-box" >
<el-table
:data="orderList"
border
style="width: 100%">
<el-table-column type="index" width="50" align="center" label="序号"/>
<el-table-column align="center" prop="storeName" label="机构名称"></el-table-column>
@ -331,6 +332,8 @@ import {parseTime} from "@/utils/fuint";
.box-card{
width: 100%;
margin: 0px 20px 20px 20px;
border: none;
box-shadow: none;
}
.el-form--inline .el-form-item {

6
fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/store.vue
View File

@ -1,6 +1,6 @@
<!-- 收银台订单-->
<template>
<div style="margin-top: 0px; margin-right: 40px">
<div style="padding-top: 20px; padding-right: 40px; background: #f6f8f9;" shadow="never">
<el-card class="box-card">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px" >
<div class="d-s" style="justify-content: space-between;width: 100%">
@ -59,7 +59,7 @@
</div>
</div>
</el-card>
<el-card class="box-card">
<el-card class="box-card" style="min-height: 500px;" shadow="never">
<div class="table-box">
<el-table
:data="orderList"
@ -307,6 +307,8 @@ import {parseTime} from "@/utils/fuint";
.box-card{
width: 100%;
margin: 0px 20px 20px 20px;
border: none;
box-shadow: none;
}
.el-form--inline .el-form-item {

9
fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/vip.vue
View File

@ -1,7 +1,7 @@
<!-- 收银台订单-->
<template>
<div style="margin-top: 0px;margin-right: 40px">
<el-card class="box-card">
<div class="" style="padding-top: 20px; padding-right: 40px; background: #f6f8f9;min-height: 900px;">
<el-card class="box-card" shadow="never">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px">
<el-form-item label="" prop="deptId" style="width: 180px">
<el-select
@ -52,10 +52,11 @@
</div>
</div>
</el-card>
<el-card class="box-card">
<el-card class="box-card" style="min-height: 500px;" shadow="never">
<div class="table-box">
<el-table
:data="orderList"
border
style="width: 100%">
<el-table-column type="index" width="50" align="center" label="序号"/>
<el-table-column prop="userName" align="center" label="会员名称"> </el-table-column>
@ -228,6 +229,8 @@ import {getFenXiUserbalanceDataApi, getFenXiUserbalanceListApi} from "@/api/fina
.box-card{
width: 100%;
margin: 0px 20px 20px 20px;
border: none;
box-shadow: none;
}
.el-form--inline .el-form-item {

11
fuintAdmin_zt/src/views/indexBanner/index.vue
View File

@ -1,6 +1,7 @@
<template>
<div style="margin: 20px">
<el-card class="card" style="margin-bottom: 20px">
<div style="padding: 20px;background: #f6f8f9;">
<el-card class="card" style="margin-bottom: 20px;border: none;
box-shadow: none;" shadow="never" >
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
<el-form-item label="店铺" prop="storeId">
<el-select v-model="queryParams.storeId" filterable placeholder="请选择店铺" clearable style="width: 100%">
@ -27,8 +28,10 @@
</el-form>
</el-card>
<el-card class="card">
<div style="margin-bottom: 10px">
<el-card class="card" style="border: none;
box-shadow: none;" shadow="never">
<div style="margin-bottom: 10px;border: none;
box-shadow: none;" shadow="never">
<el-button
type="primary"
icon="el-icon-plus"

4
fuintAdmin_zt/src/views/setting/app/index.vue
View File

@ -1,6 +1,6 @@
<template>
<div class="app-container">
<el-card >
<div class="card-change">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
<el-form-item label="" prop="legalRepresentativeContact">
@ -93,7 +93,7 @@
@pagination="getList"
/>
</el-card>
</div>
<el-dialog :title="title" :close-on-click-modal="false" :visible.sync="open" width="30%" append-to-body>
<!-- <el-form ref="form" :model="deviceInfo" label-width="80px">-->

4
fuintAdmin_zt/src/views/setting/banner/index.vue
View File

@ -1,6 +1,6 @@
<template>
<div class="app-container">
<el-card >
<div class="card-change" >
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
<el-form-item label="" prop="name">
<el-input
@ -111,7 +111,7 @@
@pagination="getList"
/>
</el-card>
</div>
<el-dialog :title="title" :close-on-click-modal="false" :visible.sync="open" width="55%" append-to-body>
<el-form ref="form" :model="deviceInfo" label-width="80px" :rules="rules">

4
fuintAdmin_zt/src/views/setting/hardware.vue
View File

@ -1,6 +1,6 @@
<template>
<div class="app-container">
<el-card >
<div class="card-change" >
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="90px">
<el-form-item label="" prop="name">
<el-input
@ -112,7 +112,7 @@
@pagination="getList"
/>
</el-card>
</div>
<el-dialog :title="title" :close-on-click-modal="false" :visible.sync="open" width="50%" append-to-body>
<el-form ref="form" :rules="rules" :model="form" label-width="80px">

4
fuintAdmin_zt/src/views/setting/message.vue
View File

@ -1,6 +1,6 @@
<template>
<div class="app-container">
<el-card >
<div class="card-change">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="180px">
<el-form-item label="" prop="name">
<el-input
@ -89,7 +89,7 @@
@pagination="getList"
/>
</el-card>
</div>
<el-dialog :title="title" :close-on-click-modal="false" :visible.sync="open" width="35%" append-to-body>
<el-form ref="form" :rules="rules" :model="form" label-width="120px">

4
fuintAdmin_zt/src/views/setting/pay/index.vue
View File

@ -1,6 +1,6 @@
<template>
<div class="app-container">
<el-card >
<div class="card-change">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
<el-form-item label="" prop="deptId">
<!-- <el-input-->
@ -129,7 +129,7 @@
@pagination="getList"
/>
</el-card>
</div>
<el-dialog :title="title" :close-on-click-modal="false" :visible.sync="open" width="30%" append-to-body>
<el-form :model="deviceInfo" ref="deviceForm" label-width="120px" :rules="rules">

10
fuintAdmin_zt/src/views/setting/sysLog.vue
View File

@ -8,18 +8,12 @@
<el-card style="margin: 20px">
<div class="card-change" style="margin: 20px">
<!-- <el-tabs v-model="activeName" @tab-click="handleClick">-->
<!-- <el-tab-pane label="中台系统" name="first"></el-tab-pane>-->
<!-- <el-tab-pane label="油站系统" name="second"></el-tab-pane>-->
<!-- </el-tabs>-->
<!--=======-->
<!-- <el-card >-->
<!-- <el-tabs v-model="activeName" @tab-click="handleClick">-->
@ -119,7 +113,7 @@
@pagination="getList"
/>
</el-card>
</div>
<el-dialog :title="title" :close-on-click-modal="false" :visible.sync="open" width="50%" append-to-body>
<el-form ref="form" :rules="rules" :model="form" label-width="80px">

4
fuintAdmin_zt/src/views/system/notify/page/getNotify.vue
View File

@ -1,6 +1,6 @@
<template>
<div class="app-container">
<el-card >
<div class="card-change">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
<el-form-item label="" prop="deptName">
<el-input
@ -45,7 +45,7 @@
@pagination="getList"
/>
</el-card>
</div>
</div>
</template>

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

@ -1,6 +1,6 @@
<template>
<div class="app-container">
<el-card >
<div class="card-change">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
<el-form-item label="" prop="notificationName">
<el-input
@ -90,7 +90,7 @@
@pagination="getList"
/>
</el-card>
</div>
<el-dialog :title="title" :close-on-click-modal="false" :visible.sync="open" width="50%" append-to-body>
<el-form :model="form" label-width="120px">

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

@ -1,6 +1,6 @@
<template>
<div class="app-container">
<el-card >
<div class="card-change">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
<el-form-item label="" prop="deptName">
<el-input
@ -93,7 +93,7 @@
@pagination="getList"
/>
</el-card>
</div>
<el-dialog :title="title" :close-on-click-modal="false" :visible.sync="open" width="35%" append-to-body>
<el-form ref="form" :model="form" label-width="80px">

2
fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/entity/MtInventory.java
View File

@ -31,7 +31,7 @@ public class MtInventory extends BaseEntity {
/**
* 制单日期
*/
// @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date orderDate;
/**
* 审核人