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

11.12

Browse Source
This commit is contained in:
DESKTOP-369JRHT\12997 2024-11-12 08:54:54 +08:00
parent ffb623b829
commit 814e951b54
7 changed files with 38 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fuintAdmin/src/App.vue
View File

@ -21,6 +21,8 @@
.app-container{
width: 100%;
background: #f6f8f9;
box-sizing: border-box;
padding: 10px;
}
</style>

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

@ -11,32 +11,12 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<!-- <el-form-item style="float: right">-->
<!-- <el-form-item label="" prop="bannerName">-->
<!-- <el-select v-model="queryParams.systemPosition" placeholder="请选择系统位置">-->
<!-- <el-option-->
<!-- v-for="item in systemPositionList"-->
<!-- :key="item.value"-->
<!-- :label="item.label"-->
<!-- :value="item.value">-->
<!-- </el-option>-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item label="" prop="bannerName">
<el-select v-model="queryParams.bannerStatus" placeholder="请选择banner图状态">
<el-option label="停用" value="0"></el-option>
<el-option label="启用" value="1"></el-option>
<!-- <el-option-->
<!-- v-for="item in systemPositionList"-->
<!-- :key="item.value"-->
<!-- :label="item.label"-->
<!-- :value="item.value">-->
<!-- </el-option>-->
</el-select>
</el-form-item>
<el-form-item style="float: right">
<el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
@ -49,13 +29,7 @@
</el-button>
</el-form-item>
</el-form>
<!-- </el-card>-->
<!-- &lt;!&ndash; 列表信息&ndash;&gt;-->
<!-- <el-card style="margin-top: 20px" >-->
<div style="height: 70vh;overflow: auto">
<div style="height: 74vh;overflow: auto">
<el-table :data="tableData" style="width: 100%;" border>
<el-table-column type="index" label="序号"></el-table-column>
<el-table-column prop="bannerName" label="banner名称"></el-table-column>
@ -510,5 +484,10 @@ export default {
align-items: center;
height: 100%;
}
.app-container{
box-sizing: border-box;
padding: 10px ;
}
</style>

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

@ -37,7 +37,7 @@
</el-form-item>
</el-form>
<div style="height: 70vh;overflow: auto">
<div style="height: 74vh;overflow: auto;scrollbar-width: none">
<el-table :data="tableData" border style="width: 100%">
<el-table-column type="index" label="序号"></el-table-column>
<el-table-column prop="messageId" label="短信模板ID"></el-table-column>
@ -390,5 +390,9 @@ export default {
width: 98px;
height: 98px;
}
.app-container{
box-sizing: border-box;
padding: 10px;
}
</style>

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

@ -23,20 +23,19 @@
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
<!-- </el-card>-->
<!-- &lt;!&ndash; &ndash;&gt;-->
<!-- &lt;!&ndash; 列表信息&ndash;&gt;-->
<!-- <el-card style="margin-top: 20px" >-->
<el-table :data="tableData" style="width: 100%" border>
<el-table-column align="center" type="index" label="序号"></el-table-column>
<el-table-column align="center" prop="notificationName" label="通知名称"></el-table-column>
<el-table-column align="center" prop="notificationType" label="通知类型"></el-table-column>
<el-table-column align="center" prop="templateContent" label="通知内容"></el-table-column>
<!-- <el-table-column align="center" prop="sendStatus" label="通知状态"></el-table-column>-->
<el-table-column align="center" prop="createName" label="创建人"></el-table-column>
<el-table-column align="center" prop="createTime" label="创建时间"></el-table-column>
<el-table-column align="center" prop="createTime" label="发送时间"></el-table-column>
</el-table>
<div class="table-box">
<el-table :data="tableData" style="width: 100%" border>
<el-table-column align="center" type="index" label="序号"></el-table-column>
<el-table-column align="center" prop="notificationName" label="通知名称"></el-table-column>
<el-table-column align="center" prop="notificationType" label="通知类型"></el-table-column>
<el-table-column align="center" prop="templateContent" label="通知内容"></el-table-column>
<!-- <el-table-column align="center" prop="sendStatus" label="通知状态"></el-table-column>-->
<el-table-column align="center" prop="createName" label="创建人"></el-table-column>
<el-table-column align="center" prop="createTime" label="创建时间"></el-table-column>
<el-table-column align="center" prop="createTime" label="发送时间"></el-table-column>
</el-table>
</div>
<pagination
v-show="total>0"
:total="total"
@ -310,5 +309,14 @@ export default {
height: 50px;
line-height: 60px;
}
.app-container{
padding: 10px;
}
.table-box{
width: 100%;
height: 74vh;
overflow: auto;
scrollbar-width: none;
}
</style>

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

@ -480,7 +480,7 @@ export default {
}
.table_box{
width: 100%;
height: 69vh;
height: 70vh;
}
</style>

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

@ -576,7 +576,7 @@ export default {
}
.table_box{
width: 100%;
height: 69vh;
height: 70vh;
}
</style>

2
fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/AllOrderInfoController.java
View File

@ -519,7 +519,7 @@ public class AllOrderInfoController extends BaseController {
this.allOrderInfoService.exportExcelBackOrderMsgsApi(response, allOrderInfoRes);
}
`
/**
* 交易对账
* 交易明细分页查询