zyj #10

Merged
caoliancun merged 2 commits from zyj into master 2 years ago
  1. 2
      src/views/driver/user/SysCustomerInfoAdd.vue
  2. 47
      src/views/driver/user/SysCustomerInfoList.vue
  3. 2
      src/views/driver/user/SysCustomerInfoUpdate.vue
  4. 4
      src/views/driver/vehicle/OilVehicleOwnerAdd.vue
  5. 4
      src/views/driver/vehicle/OilVehicleOwnerList.vue
  6. 4
      src/views/driver/vehicle/OilVehicleOwnerUpdate.vue
  7. 2
      src/views/finance/oilCompanyMatch/OilCompanyMatchAdd.vue
  8. 32
      src/views/finance/oilCompanyMatch/OilCompanyMatchList.vue
  9. 2
      src/views/finance/oilCompanyMatch/OilCompanyMatchUpdate.vue
  10. 4
      src/views/finance/oilCompanyMatchRecord/OilCompanyMatchRecordList.vue
  11. 4
      src/views/finance/oilCompanyOrderMatchTask/OilCompanyOrderMatchTaskList.vue
  12. 2
      src/views/finance/openTicket/openTicketList.vue
  13. 19
      src/views/site/oilSiteOilsPrice/OilSiteOilsPriceList.vue
  14. 2
      src/views/system/auth/sysUser/SysCustomerInfoAdd.vue
  15. 51
      src/views/system/auth/sysUser/SysCustomerInfoList.vue
  16. 2
      src/views/system/auth/sysUser/SysCustomerInfoUpdate.vue

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

@ -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
@ -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;

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

@ -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>

@ -669,8 +669,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;

@ -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>

@ -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">

@ -178,15 +178,17 @@
</div>
</ListLayout>
<!-- 添加弹窗 -->
<el-dialog
v-el-drag-dialog
<!-- 添加抽屉 -->
<el-drawer
title="添加"
class="table-detail-drawer"
:visible.sync="addDialog"
width="55%"
direction="ltr"
size="60%"
>
<OilCompanyMatchAdd @getByPage="getByPage" @closeDialog="closeDialog" />
</el-dialog>
<OilCompanyMatchAdd @getByPage="getByPage" @closeDialog="closeDialog" />
</el-drawer>
<!-- 导出弹窗 -->
<el-dialog
@ -214,20 +216,22 @@
/>
</el-dialog>
<!-- 修改弹窗 -->
<el-dialog
v-el-drag-dialog
<!-- 修改抽屉 -->
<el-drawer
title="修改"
class="table-detail-drawer"
:visible.sync="updateDialog"
width="55%"
direction="ltr"
size="60%"
>
<OilCompanyMatchUpdate
<OilCompanyMatchUpdate
v-if="updateDialog"
:oil-company-match="oilCompanyMatch"
@getByPage="getByPage"
@closeDialog="closeDialog"
/>
</el-dialog>
</el-drawer>
<!-- 详情抽屉 -->
<el-drawer
@ -750,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;

@ -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">

@ -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;

@ -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;

@ -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>

@ -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'

@ -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">

@ -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="50%"
>
<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="50%"
>
<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="50%"
>
<SysCustomerInfoUpdate
<SysCustomerInfoUpdate
v-if="updateDialog"
:sys-customer-info="sysCustomerInfo"
@getByPage="getByPage"
@closeDialog="closeDialog"
/>
</el-dialog>
</el-drawer>
<!-- 详情抽屉 -->
<el-drawer
@ -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;

@ -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">

Loading…
Cancel
Save