caoliancun
/
dispacth_zhongpin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Labels Milestones
New Pull Request

zyj #10

Merged
caoliancun merged 2 commits from zyj into master 2 years ago
Conversation 0 Commits 2 Files Changed 16
16 changed files with 99 additions and 84 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      src/views/driver/user/SysCustomerInfoAdd.vue
  2. 43
      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. 28
      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. 13
      src/views/site/oilSiteOilsPrice/OilSiteOilsPriceList.vue
  14. 2
      src/views/system/auth/sysUser/SysCustomerInfoAdd.vue
  15. 45
      src/views/system/auth/sysUser/SysCustomerInfoList.vue
  16. 2
      src/views/system/auth/sysUser/SysCustomerInfoUpdate.vue

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

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

43
src/views/driver/user/SysCustomerInfoList.vue
Unescape View File

@ -171,14 +171,15 @@
</div> </div>
</ListLayout> </ListLayout>
<!-- 修改密码弹窗 --> <!-- 修改密码抽屉 -->
<el-dialog <el-drawer
v-el-drag-dialog
destroy-on-close
title="修改密码" title="修改密码"
class="table-detail-drawer"
:visible.sync="updatePwdDialog" :visible.sync="updatePwdDialog"
width="55%" direction="ltr"
size="55%"
> >
<div style="padding: 20px;">
<el-form <el-form
ref="form" ref="form"
:model="updatePwd" :model="updatePwd"
@ -193,18 +194,20 @@
<el-button @click="updatePwdDialog = false;">取消</el-button> <el-button @click="updatePwdDialog = false;">取消</el-button>
<el-button type="primary" @click="updatePwdSubmit">提交</el-button> <el-button type="primary" @click="updatePwdSubmit">提交</el-button>
</div> </div>
</el-dialog> </div>>
</el-drawer>
<!-- 添加弹窗 --> <!-- 添加抽屉 -->
<el-dialog <el-drawer
v-el-drag-dialog
destroy-on-close
title="添加" title="添加"
class="table-detail-drawer"
:visible.sync="addDialog" :visible.sync="addDialog"
width="55%" direction="ltr"
size="55%"
> >
<SysCustomerInfoAdd @getByPage="getByPage" @closeDialog="closeDialog" /> <SysCustomerInfoAdd @getByPage="getByPage" @closeDialog="closeDialog" />
</el-dialog> </el-drawer>
<!-- 导出弹窗 --> <!-- 导出弹窗 -->
<el-dialog <el-dialog
@ -232,12 +235,13 @@
/> />
</el-dialog> </el-dialog>
<!-- 修改弹窗 --> <!-- 修改抽屉 -->
<el-dialog <el-drawer
destroy-on-close
title="修改" title="修改"
class="table-detail-drawer"
:visible.sync="updateDialog" :visible.sync="updateDialog"
width="55%" direction="ltr"
size="55%"
> >
<SysCustomerInfoUpdate <SysCustomerInfoUpdate
v-if="updateDialog" v-if="updateDialog"
@ -245,7 +249,8 @@
@getByPage="getByPage" @getByPage="getByPage"
@closeDialog="closeDialog" @closeDialog="closeDialog"
/> />
</el-dialog> </el-drawer>
<!-- 详情抽屉 --> <!-- 详情抽屉 -->
<el-drawer <el-drawer
@ -623,8 +628,8 @@ export default {
margin-bottom: 20px; margin-bottom: 20px;
} }
.table-div >>> .header-container { .table-div >>> .header-container {
position: sticky; /* position: sticky;
top: 0rem; top: 0rem; */
min-height: 152px; min-height: 152px;
z-index: 4; z-index: 4;
background: #fff; background: #fff;

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

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

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

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

4
src/views/driver/vehicle/OilVehicleOwnerList.vue
Unescape View File

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

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

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

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

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

28
src/views/finance/oilCompanyMatch/OilCompanyMatchList.vue
Unescape View File

@ -178,15 +178,17 @@
</div> </div>
</ListLayout> </ListLayout>
<!-- 添加弹窗 --> <!-- 添加抽屉 -->
<el-dialog <el-drawer
v-el-drag-dialog
title="添加" title="添加"
class="table-detail-drawer"
:visible.sync="addDialog" :visible.sync="addDialog"
width="55%" direction="ltr"
size="60%"
> >
<OilCompanyMatchAdd @getByPage="getByPage" @closeDialog="closeDialog" /> <OilCompanyMatchAdd @getByPage="getByPage" @closeDialog="closeDialog" />
</el-dialog> </el-drawer>
<!-- 导出弹窗 --> <!-- 导出弹窗 -->
<el-dialog <el-dialog
@ -214,12 +216,13 @@
/> />
</el-dialog> </el-dialog>
<!-- 修改弹窗 --> <!-- 修改抽屉 -->
<el-dialog <el-drawer
v-el-drag-dialog
title="修改" title="修改"
class="table-detail-drawer"
:visible.sync="updateDialog" :visible.sync="updateDialog"
width="55%" direction="ltr"
size="60%"
> >
<OilCompanyMatchUpdate <OilCompanyMatchUpdate
v-if="updateDialog" v-if="updateDialog"
@ -227,7 +230,8 @@
@getByPage="getByPage" @getByPage="getByPage"
@closeDialog="closeDialog" @closeDialog="closeDialog"
/> />
</el-dialog> </el-drawer>
<!-- 详情抽屉 --> <!-- 详情抽屉 -->
<el-drawer <el-drawer
@ -750,8 +754,8 @@ export default {
margin-bottom: 20px; margin-bottom: 20px;
} }
.table-div >>> .header-container { .table-div >>> .header-container {
position: sticky; /* position: sticky;
top: 0rem; top: 0rem; */
min-height: 152px; min-height: 152px;
z-index: 4; z-index: 4;
background: #fff; background: #fff;

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

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

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

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

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

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

2
src/views/finance/openTicket/openTicketList.vue
Unescape View File

@ -80,7 +80,7 @@
<el-col :span="9"> <el-col :span="9">
<el-form-item> <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" /> @keyup.enter.native="getByPage" />
</el-form-item> </el-form-item>
</el-col> </el-col>

13
src/views/site/oilSiteOilsPrice/OilSiteOilsPriceList.vue
Unescape View File

@ -91,7 +91,7 @@
<el-button class="group-item" :size="$store.getters.size" type="success" @click="piliangAdd"><svg-icon <el-button class="group-item" :size="$store.getters.size" type="success" @click="piliangAdd"><svg-icon
icon-class="iconiconfonticon02" /> 快速调价任务</el-button> icon-class="iconiconfonticon02" /> 快速调价任务</el-button>
</el-col> </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 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=" <el-button :size="$store.getters.size" icon="el-icon-refresh" type="info" @click="
page.params = {} page.params = {}
@ -158,9 +158,10 @@
<!-- 分页组件结束 --> <!-- 分页组件结束 -->
</div> </div>
</ListLayout> </ListLayout>
<!-- 历史记录弹窗 --> <!-- 历史记录抽屉 -->
<el-dialog v-el-drag-dialog title="变更历史" :visible.sync="showHistory" width="55%"> <el-drawer :withHeader="false" title="变更历史" :visible.sync="showHistory" direction="ltr" size="55%">
<el-table :data="historyData" style="width: 100%"> <div style="padding: 20px;">
<el-table :data="historyData" style="width: 100%" border>
<el-table-column prop="createTime" label="创建时间" /> <el-table-column prop="createTime" label="创建时间" />
<el-table-column prop="name" label="基础个人价"> <el-table-column prop="name" label="基础个人价">
@ -196,7 +197,9 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
</el-dialog> </div>
</el-drawer>
<!-- 导出弹窗 --> <!-- 导出弹窗 -->
<el-dialog v-el-drag-dialog title="导出" :visible.sync="outPutDialog" width="20%"> <el-dialog v-el-drag-dialog title="导出" :visible.sync="outPutDialog" width="20%">
<OilSiteOilsPriceOutput :page="page" :dataPage="dataPage" v-if="outPutDialog" <OilSiteOilsPriceOutput :page="page" :dataPage="dataPage" v-if="outPutDialog"

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

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

45
src/views/system/auth/sysUser/SysCustomerInfoList.vue
Unescape View File

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

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

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

Write Preview
Loading…
Cancel
Save