caoliancun/dispacth_zhongpin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of http://121.196.213.68:3000/caoliancun/dispacth_zhongpin into lifei

Browse Source
This commit is contained in:
李飞
2023-05-08 09:25:32 +08:00
parent 1a61692803 e7fca62c03
commit 6c11e4a4d7
30 changed files with 264 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/driver/user/SysCustomerInfoAdd.vue
View File

@@ -1,5 +1,5 @@
<template>
<div>
<div style="padding: 20px;">
<el-row>
<el-form
ref="form"

51
src/views/driver/user/SysCustomerInfoList.vue
View File

@@ -129,7 +129,7 @@
:size="$store.getters.size"
type="text"
@click="handleDetail(scope.row.id)"
><svg-icon icon-class="iconxiangqing1" /> 操作</el-button
><svg-icon icon-class="iconxiangqing1" /> 详情</el-button
>
<el-dropdown>
<el-button type="text">
@@ -171,14 +171,15 @@
</div>
</ListLayout>
<!-- 修改密码弹窗 -->
<el-dialog
v-el-drag-dialog
destroy-on-close
<!-- 修改密码抽屉 -->
<el-drawer
title="修改密码"
class="table-detail-drawer"
:visible.sync="updatePwdDialog"
width="55%"
direction="ltr"
size="55%"
>
<div style="padding: 20px;">
<el-form
ref="form"
:model="updatePwd"
@@ -193,18 +194,20 @@
<el-button @click="updatePwdDialog = false;">取消</el-button>
<el-button type="primary" @click="updatePwdSubmit">提交</el-button>
</div>
</el-dialog>
</div>>
</el-drawer>
<!-- 添加弹窗 -->
<el-dialog
v-el-drag-dialog
destroy-on-close
<!-- 添加抽屉 -->
<el-drawer
title="添加"
class="table-detail-drawer"
:visible.sync="addDialog"
width="55%"
direction="ltr"
size="55%"
>
<SysCustomerInfoAdd @getByPage="getByPage" @closeDialog="closeDialog" />
</el-dialog>
<SysCustomerInfoAdd @getByPage="getByPage" @closeDialog="closeDialog" />
</el-drawer>
<!-- 导出弹窗 -->
<el-dialog
@@ -232,20 +235,22 @@
/>
</el-dialog>
<!-- 修改弹窗 -->
<el-dialog
destroy-on-close
<!-- 修改抽屉 -->
<el-drawer
title="修改"
class="table-detail-drawer"
:visible.sync="updateDialog"
width="55%"
direction="ltr"
size="55%"
>
<SysCustomerInfoUpdate
<SysCustomerInfoUpdate
v-if="updateDialog"
:sys-customer-info="sysCustomerInfo"
@getByPage="getByPage"
@closeDialog="closeDialog"
/>
</el-dialog>
</el-drawer>
<!-- 详情抽屉 -->
<el-drawer
@@ -253,7 +258,7 @@
class="table-detail-drawer"
:visible.sync="showTableDrawer"
direction="ltr"
size="80%"
size="55%"
>
<SysCustomerInfoInfo
v-if="showTableDrawer"
@@ -623,8 +628,8 @@ export default {
margin-bottom: 20px;
}
.table-div >>> .header-container {
position: sticky;
top: 0rem;
/* position: sticky;
top: 0rem; */
min-height: 152px;
z-index: 4;
background: #fff;

2
src/views/driver/user/SysCustomerInfoUpdate.vue
View File

@@ -1,5 +1,5 @@
<template>
<div>
<div style="padding: 20px;">
<el-row>
<el-form
ref="form"

4
src/views/driver/vehicle/OilVehicleOwnerAdd.vue
View File

@@ -6,7 +6,7 @@
label-width="100px"
:size="$store.getters.size"
>
<el-card class="box-card">
<el-card class="box-card" style="margin: 0 20px;">
<div slot="header" class="clearfix">
<span>车辆基础信息</span>
</div>
@@ -136,7 +136,7 @@
<el-col />
</el-row> -->
</el-card>
<el-col :span="24" style="text-align: right">
<el-col :span="24" style="text-align: right;padding: 20px;">
<el-button @click="close">取消</el-button>
<el-button type="primary" @click="submit">提交</el-button>
</el-col>

24
src/views/driver/vehicle/OilVehicleOwnerList.vue
View File

@@ -190,25 +190,27 @@
v-el-drag-dialog
title="添加"
:visible.sync="addDialog"
size="60%"
size="55%"
direction="ltr"
destroy-on-close
>
<OilVehicleOwnerAdd @getByPage="getByPage" @closeDialog="closeDialog" />
</el-drawer>
<!-- 导出弹窗 -->
<el-dialog
<!-- 导出抽屉 -->
<el-drawer
v-el-drag-dialog
title="导出"
:visible.sync="outPutDialog"
width="55%"
size="55%"
direction="ltr"
destroy-on-close
>
<OilVehicleOwnerOutput
<OilVehicleOwnerOutput
@getByPage="getByPage"
@closeDialog="closeDialog"
/>
</el-dialog>
</el-drawer>
<!-- 导入弹窗 -->
<el-dialog
@@ -223,12 +225,12 @@
/>
</el-dialog>
<!-- 修改弹窗 -->
<!-- 修改抽屉 -->
<el-drawer
v-el-drag-dialog
title="修改"
:visible.sync="updateDialog"
size="60%"
size="55%"
direction="ltr"
destroy-on-close
>
@@ -246,7 +248,7 @@
class="table-detail-drawer"
:visible.sync="showTableDrawer"
direction="ltr"
size="50%"
size="55%"
:withHeader="false"
>
<general-details
@@ -669,8 +671,8 @@ export default {
margin-bottom: 20px;
}
.table-div >>> .header-container {
position: sticky;
top: 0rem;
/* position: sticky;
top: 0rem; */
min-height: 152px;
z-index: 4;
background: #fff;

2
src/views/driver/vehicle/OilVehicleOwnerOutput.vue
View File

@@ -1,5 +1,5 @@
<template>
<div>
<div style="padding: 20px;">
<el-row>
<el-form :model="data" label-width="100px" :size="$store.getters.size">
<el-row :gutter="gridNum.row.gutter">

4
src/views/driver/vehicle/OilVehicleOwnerUpdate.vue
View File

@@ -6,7 +6,7 @@
label-width="100px"
:size="$store.getters.size"
>
<el-card class="box-card">
<el-card class="box-card" style="margin: 0 20px;">
<div slot="header" class="clearfix">
<span>车辆基础信息</span>
</div>
@@ -136,7 +136,7 @@
<el-col />
</el-row> -->
</el-card>
<el-col :span="24" style="text-align: right">
<el-col :span="24" style="text-align: right;padding: 20px;;">
<el-button @click="close">取消</el-button>
<el-button type="primary" @click="submit">提交</el-button>
</el-col>

2
src/views/finance/oilCompanyMatch/OilCompanyMatchAdd.vue
View File

@@ -1,5 +1,5 @@
<template>
<div>
<div style="padding: 20px;">
<el-row>
<el-form :model="oilCompanyMatch" label-width="140px" :rules="ruleForm" ref="ruleForm" :size="$store.getters.size">
<el-row :gutter="gridNum.row.gutter">

40
src/views/finance/oilCompanyMatch/OilCompanyMatchList.vue
View File

@@ -178,23 +178,24 @@
</div>
</ListLayout>
<!-- 添加弹窗 -->
<el-dialog
v-el-drag-dialog
<!-- 添加抽屉 -->
<el-drawer
title="添加"
class="table-detail-drawer"
:visible.sync="addDialog"
width="55%"
v-if="addDialog"
direction="ltr"
size="60%"
>
<OilCompanyMatchAdd @getByPage="getByPage" @closeDialog="closeDialog" />
</el-dialog>
<OilCompanyMatchAdd @getByPage="getByPage" @closeDialog="closeDialog" />
</el-drawer>
<!-- 导出弹窗 -->
<el-dialog
v-el-drag-dialog
title="导出"
:visible.sync="outPutDialog"
width="55%"
width="60%"
>
<OilCompanyMatchOutput
@getByPage="getByPage"
@@ -207,7 +208,7 @@
v-el-drag-dialog
title="导入"
:visible.sync="importDialog"
width="55%"
width="60%"
>
<OilCompanyMatchImport
@getByPage="getByPage"
@@ -215,28 +216,29 @@
/>
</el-dialog>
<!-- 修改弹窗 -->
<el-dialog
v-el-drag-dialog
<!-- 修改抽屉 -->
<el-drawer
title="修改"
class="table-detail-drawer"
:visible.sync="updateDialog"
width="55%"
v-if="addDialog"
direction="ltr"
size="60%"
>
<OilCompanyMatchUpdate
<OilCompanyMatchUpdate
v-if="updateDialog"
:oil-company-match="oilCompanyMatch"
@getByPage="getByPage"
@closeDialog="closeDialog"
/>
</el-dialog>
</el-drawer>
<!-- 详情抽屉 -->
<el-drawer
title="详情"
class="table-detail-drawer"
:visible.sync="showTableDrawer"
size="55%"
size="60%"
direction="ltr"
:withHeader="false"
>
@@ -752,8 +754,8 @@ export default {
margin-bottom: 20px;
}
.table-div >>> .header-container {
position: sticky;
top: 0rem;
/* position: sticky;
top: 0rem; */
min-height: 152px;
z-index: 4;
background: #fff;

2
src/views/finance/oilCompanyMatch/OilCompanyMatchUpdate.vue
View File

@@ -1,5 +1,5 @@
<template>
<div>
<div style="padding: 20px;">
<el-row>
<el-form :model="oilCompanyMatch" :rules="ruleForm" ref="ruleForm" label-width="140px" :size="$store.getters.size">
<el-row :gutter="gridNum.row.gutter">

4
src/views/finance/oilCompanyMatchRecord/OilCompanyMatchRecordList.vue
View File

@@ -588,8 +588,8 @@ export default {
}
.table-div>>>.header-container {
position: sticky;
top: 0rem;
/* position: sticky;
top: 0rem; */
min-height: 152px;
z-index: 4;
background: #fff;

4
src/views/finance/oilCompanyOrderMatchTask/OilCompanyOrderMatchTaskList.vue
View File

@@ -772,8 +772,8 @@ export default {
}
.table-div>>>.header-container {
position: sticky;
top: 0rem;
/* position: sticky;
top: 0rem; */
min-height: 152px;
z-index: 4;
background: #fff;

4
src/views/finance/openTicket/openTicketInfoUpdate.vue
View File

@@ -116,8 +116,8 @@
<div style="float: right;">
<el-button @click="$emit('close')">取消</el-button>
<el-button @click="update">修改</el-button>
<el-button type="primary" @click="updateAndAudit">修改并审核</el-button>
<el-button @click="update">提交</el-button>
<el-button type="primary" @click="updateAndAudit">提交并审核</el-button>
</div>
</div>
</template>

4
src/views/finance/openTicket/openTicketList.vue
View File

@@ -80,7 +80,7 @@
<el-col :span="9">
<el-form-item>
<gl-date-time-picker v-model="page.params.createTime" style="width: 131%" msg="创建时间"
<gl-date-time-picker v-model="page.params.createTime" style="width: 134%" msg="创建时间"
@keyup.enter.native="getByPage" />
</el-form-item>
</el-col>
@@ -96,7 +96,7 @@
<el-col :span="1">
<el-button type="primary" :size="$store.getters.size" icon="el-icon-plus"
@click="addRecordDialog = true">
新增</el-button>
添加</el-button>
</el-col>
<el-col :span="23">
<el-button type="primary" :size="$store.getters.size" icon="el-icon-search" @click="getByPage">查询

2
src/views/finance/openTicket/openTicketRecordAdd.vue
View File

@@ -103,7 +103,7 @@
</section>
<div style="float: right;">
<el-button @click="$emit('close')">取消</el-button>
<el-button type="primary" @click="add()">新增</el-button>
<el-button type="primary" @click="add()">提交</el-button>
</div>
</div>

65
src/views/login/css/index.css
View File

@@ -1,7 +1,8 @@
html {
font-size: 16px !important;
}
/* iPhone6的375px尺寸作为16px基准，414px正好18px大小,600 20px */
/* iPhone6的375px尺寸作为16px基准，414px正好18px大小,600 20px */
/* @media screen and (min-width:375px) {
html {
font-size: calc(100% + 2 * (100vw - 375px) / 39);
@@ -43,29 +44,44 @@ html {
margin: 0;
width: 100vw;
height: 100vh;
background-size: calc(100vw - 25.5rem) 100%;
background-repeat: no-repeat;
background-position: right;
background-origin: border-box;
background-attachment: fixed;
/* background-size: calc(100vw - 25.5rem) 100%; */
/* background-repeat: no-repeat; */
/* background-position: right; */
/* background-origin: border-box; */
/* background-attachment: fixed; */
animation: start .5s;
overflow: auto;
background-image: url('../../../assets/img/login/bg@2x.png') !important;
/* background-image: url('../../../assets/img/login/bg@2x.png') !important; */
background: linear-gradient(to right, #D3DFFB, #FFFFFF, #F0FBFE);
display: flex;
justify-content: center;
align-items: center;
}
.newlogin_container_tb img {
width: 554px;
height: 554px;
margin-right: 234px;
}
.newlogin_login_container {
height: 100%;
width: 100%;
padding: 5.7rem 0 0 5.7rem;
/* height: 100%;
width: 100%; */
/* padding: 5.7rem 0 0 5.7rem; */
animation: move 1s;
/* animation-delay:1s;
-webkit-animation-delay:1s; */
box-shadow: 0px 3px 10px 0px rgba(0, 0, 0, 0.1);
border-radius: 8px 8px 8px 8px;
opacity: 1;
padding: 52px 80px 94px 80px;
/* width: 460px; */
}
.newlogin_login_logo {
width: 10.8rem;
height: 3.672rem;
width: 147px;
height: 46px;
}
.newlogin_login_logo img {
@@ -74,7 +90,7 @@ html {
}
.newlogin_login_title {
color: #1767F9;
color: #000000;
font-size: 1.45rem;
margin-top: 2rem;
}
@@ -85,14 +101,14 @@ html {
}
.newlogin_container .el-input {
box-shadow: 0px 0px 6px 0px rgba(7, 0, 2, 0.2) !important;
border-radius: 36px;
/* box-shadow: 0px 0px 6px 0px rgba(7, 0, 2, 0.2) !important; */
/* border-radius: 36px; */
}
.newlogin_container .el-input__inner {
.newlogin_container .el-input__inner {
border: 0px !important;
padding-left: 50px !important;
border-radius: 36px;
/* border-radius: 36px; */
height: 2.6rem !important;
font-size: .8rem !important;
padding-right: 50px !important;
@@ -100,7 +116,7 @@ html {
}
.newlogin_container .el-form-item__content .el-input {
box-shadow: 0px 0px 6px 0px rgba(7, 0, 2, 0.2) !important;
/* box-shadow: 0px 0px 6px 0px rgba(7, 0, 2, 0.2) !important; */
}
@@ -112,8 +128,9 @@ html {
.newlogin_login_from_butten {
width: 100%;
border-radius: 36px;
font-size: 1.16rem;
/* border-radius: 36px; */
font-size: 14px;
background-color: #409EFF !important;
}
.newlogin_container .el-form-item {
@@ -133,12 +150,14 @@ html {
}
.newlogin_container .el-button--primary {
background: linear-gradient(to right, #1767F9, #4883ED);
background-color: #409EFF !important;
}
.newlogin_container .el-button--primary:hover,
.newlogin_container .el-button--primary:focus {
background: linear-gradient(to right, #1767F9, #4883ED);
background-color: #409EFF !important;
}
@@ -166,7 +185,7 @@ html {
padding-left: 20px;
font-size: 0.8rem;
color: #1767F9;
cursor:default
cursor: default
}
.verifyCode .el-input__inner {

5
src/views/login/index.vue
View File

@@ -1,10 +1,13 @@
<template>
<div v-loading="this.$store.getters.loading" class="newlogin_container">
<div class="newlogin_container_tb">
<img style="" src="../../assets/img/login/img.png" alt="" />
</div>
<div class="newlogin_login_container">
<div class="newlogin_login_logo">
<img style="" src="../../assets/img/login/logo.png" alt="" />
</div>
<div class="newlogin_login_title">星油能源调度管理平台</div>
<div class="newlogin_login_title">欢迎使用中品调度管理平台</div>
<div class="newlogin_login_from_container">
<el-form ref="form" :model="loginForm">
<el-form-item>

6
src/views/site/oilCompanySiteDiaodu/oilCompanySiteList.vue
View File

@@ -102,6 +102,7 @@
<el-date-picker
v-model="page.params.createTime"
type="datetimerange"
style="width: 105%"
value-format="yyyy-MM-dd HH:mm:ss"
range-separator="~"
start-placeholder="开始时间"
@@ -120,14 +121,15 @@
:size="$store.getters.size"
icon="el-icon-search"
@click="search"
>&nbsp;&nbsp;查询
>查询
</el-button>
<el-button
type="info"
:size="$store.getters.size"
icon="el-icon-refresh"
@click="page.params = {}"
>
&nbsp;&nbsp;重置
重置
</el-button>
</div>
</el-col>

19
src/views/site/oilSiteOilsPrice/OilSiteOilsPriceList.vue
View File

@@ -37,7 +37,7 @@
</el-select>
</el-form-item> -->
<!-- <el-form-item>
<el-input v-model="page.params.enableMark" placeholder="启用标识" clearable @keyup.enter.native="getByPage" />
<el-input v-model="page.params.enableMark" placeholder="启用标识" clearable @keyup.enter.native="getByPage" />
<el-select v-model="page.params.enableMark" filterable clearable placeholder="油品启用标识">
<el-option value="1" label="油品启用" />
<el-option value="0" label="油品禁用" />
@@ -91,7 +91,7 @@
<el-button class="group-item" :size="$store.getters.size" type="success" @click="piliangAdd"><svg-icon
icon-class="iconiconfonticon02" /> 快速调价任务</el-button>
</el-col>
<el-col :span="24">
<el-col :span="8">
<el-button type="primary" :size="$store.getters.size" icon="el-icon-search" @click="search">查询</el-button>
<el-button :size="$store.getters.size" icon="el-icon-refresh" type="info" @click="
page.params = {}
@@ -158,11 +158,12 @@
<!-- 分页组件结束 -->
</div>
</ListLayout>
<!-- 历史记录弹窗 -->
<el-dialog v-el-drag-dialog title="变更历史" :visible.sync="showHistory" width="55%">
<el-table :data="historyData" style="width: 100%">
<!-- 历史记录抽屉 -->
<el-drawer :withHeader="false" title="变更历史" :visible.sync="showHistory" direction="ltr" size="55%">
<div style="padding: 20px;">
<el-table :data="historyData" style="width: 100%" border>
<el-table-column prop="createTime" label="创建时间" />
<el-table-column prop="name" label="基础个人价">
<template slot-scope="scope">
<div>
@@ -196,7 +197,9 @@
</template>
</el-table-column>
</el-table>
</el-dialog>
</div>
</el-drawer>
<!-- 导出弹窗 -->
<el-dialog v-el-drag-dialog title="导出" :visible.sync="outPutDialog" width="20%">
<OilSiteOilsPriceOutput :page="page" :dataPage="dataPage" v-if="outPutDialog"
@@ -292,7 +295,7 @@ export default {
return ('禁用');
}
}
},
},
{
label: '基础个人价',
value: 'personalPriceBase'

6
src/views/statisticalReport/companyConsumptionStatistics.vue
View File

@@ -178,9 +178,6 @@
<el-form-item label="赊销金额">
<span> {{scope.row.chargeRechargeBalance|balanceType}}</span>
</el-form-item>
<el-form-item label="充返金额">
<span>{{scope.row.rechargeRebateBalance|balanceType}}</span>
</el-form-item>
<el-form-item label="消返金额">
<span>{{scope.row.consumeRebateBalance|balanceType}}</span>
</el-form-item>
@@ -192,9 +189,6 @@
<el-form-item label="累计赊销金额">
<span> {{dataListChild.sxje?dataListChild.sxje:'0.00'}}</span>
</el-form-item>
<el-form-item label="累计充返金额">
<span>{{dataListChild.cfje?dataListChild.cfje:'0.00'}}</span>
</el-form-item>
<el-form-item label="累计消返金额">
<span>{{dataListChild.xfje?dataListChild.xfje:'0.00'}}</span>
</el-form-item>

2
src/views/system/auth/sysUser/SysCustomerInfoAdd.vue
View File

@@ -1,5 +1,5 @@
<template>
<div>
<div style="padding: 20px;">
<el-row>
<el-form ref="form" :rules="rules" :model="sysCustomerInfo" label-width="100px" :size="$store.getters.size">
<el-row :gutter="gridNum.row.gutter">

53
src/views/system/auth/sysUser/SysCustomerInfoList.vue
View File

@@ -212,16 +212,15 @@
</div>
</ListLayout>
<!-- 修改密码弹窗 -->
<el-dialog
v-el-drag-dialog
destroy-on-close
<!-- 修改密码抽屉 -->
<el-drawer
title="修改密码"
class="table-detail-drawer"
:visible.sync="updatePwdDialog"
@closeDialog="closeDialog"
width="55%"
:before-close="handleClose"
direction="ltr"
size="55%"
>
<div style="padding: 20px;">
<el-form
ref="form"
:model="updatePwd"
@@ -236,18 +235,20 @@
<el-button @click="handleClose">取消</el-button>
<el-button type="primary" @click="updatePwdSubmit">提交</el-button>
</div>
</el-dialog>
<!-- 添加弹窗 -->
<el-dialog
v-el-drag-dialog
destroy-on-close
</div>
</el-drawer>
<!-- 添加抽屉 -->
<el-drawer
title="添加"
class="table-detail-drawer"
:visible.sync="addDialog"
width="55%"
direction="ltr"
size="55%"
>
<SysCustomerInfoAdd @getByPage="getByPage" @closeDialog="closeDialog" />
</el-dialog>
<SysCustomerInfoAdd @getByPage="getByPage" @closeDialog="closeDialog" />
</el-drawer>
<!-- 登录授权弹窗 -->
<el-dialog
@@ -290,20 +291,22 @@
/>
</el-dialog>
<!-- 修改弹窗 -->
<el-dialog
destroy-on-close
<!-- 修改抽屉 -->
<el-drawer
title="修改"
class="table-detail-drawer"
:visible.sync="updateDialog"
width="55%"
direction="ltr"
size="55%"
>
<SysCustomerInfoUpdate
<SysCustomerInfoUpdate
v-if="updateDialog"
:sys-customer-info="sysCustomerInfo"
@getByPage="getByPage"
@closeDialog="closeDialog"
/>
</el-dialog>
</el-drawer>
<!-- 详情抽屉 -->
<el-drawer
@@ -311,7 +314,7 @@
class="table-detail-drawer"
:visible.sync="showTableDrawer"
direction="ltr"
size="50%"
size="55%"
>
<SysCustomerInfoInfo
v-if="showTableDrawer"
@@ -703,8 +706,8 @@ export default {
margin-bottom: 20px;
}
.table-div >>> .header-container {
position: sticky;
top: 0rem;
/* position: sticky;
top: 0rem; */
min-height: 152px;
z-index: 4;
background: #fff;

2
src/views/system/auth/sysUser/SysCustomerInfoUpdate.vue
View File

@@ -1,5 +1,5 @@
<template>
<div>
<div style="padding: 20px;">
<el-row>
<el-form ref="form" :rules="rules" :model="sysCustomerInfo" label-width="100px" :size="$store.getters.size">
<el-row :gutter="gridNum.row.gutter">