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