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

11.13

Browse Source
This commit is contained in:
DESKTOP-369JRHT\12997 2024-11-13 14:03:57 +08:00
parent 814e951b54
commit c0d643db47
6 changed files with 10 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fuintAdmin/src/views/shopowner.vue
View File

@ -386,6 +386,7 @@ export default
},
methods: {
sjkbStoreAmount(e) {
this.dataTimeShow = false
console.log(e)
this.sjkbTitle = e
let command = e
@ -421,6 +422,7 @@ export default
this.$router.push('/notificationList/index')
},
editShow(e) {
this.showTimeShow = false
this.disabled = true
console.log(e)
this.ypjyTitle = e
@ -457,6 +459,7 @@ export default
this.getDataShow()
},
editCount(e) {
this.countTimeShow = false
this.disabled = true
this.sjtjTitle = e
console.log("e", e)

2
fuintAdmin_zt/src/views/homeComponents/agent.vue
View File

@ -3,8 +3,6 @@
<el-carousel height="230px">
<el-carousel-item v-for="(item,index) in bannerList" :key="index">
<div class="bannser">
<!-- <img src="../../assets/images/banner.png" alt="" >-->
<img :src="imagePath+item.productImage" alt="" >
</div>
</el-carousel-item>

26
fuintAdmin_zt/src/views/setting/app/index.vue
View File

@ -3,18 +3,15 @@
<div class="card-change">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
<el-form-item label="" prop="legalRepresentativeContact">
<el-select
v-model="queryParams.orgId"
clearable
placeholder="所属机构"
>
<el-option v-for="item in deptList" :key="item.deptId" :label="item.deptName" :value="item.deptId">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="" prop="legalRepresentativeContact">
<el-input
v-model="queryParams.legalRepresentativeContact"
@ -25,7 +22,6 @@
/>
</el-form-item>
<el-form-item label="" prop="legalRepresentativeContact">
<el-select v-model="queryParams.appStatus" placeholder="请选择小程序状态">
<el-option label="停用" value="0" ></el-option>
<el-option label="启用" value="1" ></el-option>
@ -41,12 +37,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: 73vh;overflow: auto">
<el-table :data="tableData" style="width: 100%" border>
<el-table-column type="index" label="序号"></el-table-column>
<el-table-column prop="orgName" label="机构名称"></el-table-column>
@ -97,18 +88,8 @@
/>
</div>
<el-dialog :title="title" :close-on-click-modal="false" :visible.sync="open" width="35%" append-to-body>
<!-- <el-form ref="form" :model="deviceInfo" label-width="80px">-->
<el-form :model="deviceInfo" ref="deviceForm" label-width="140px" :rules="rule">
<!-- <el-form-item label="机构名称" prop="orgName">-->
<!-- <el-input v-model="deviceInfo.orgName" style="width: 300px"></el-input>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="机构名称" prop="orgName">-->
<!-- <el-input v-model="deviceInfo.orgName" style="width: 300px"></el-input>-->
<!-- </el-form-item>-->
<!-- -->
<el-form-item label="机构名称" prop="orgId" style="margin-left: -20px;">
<el-select
v-model="deviceInfo.orgId"
@ -119,7 +100,6 @@
<el-option v-for="item in deptList" :key="item.deptId" :label="item.deptName" :value="item.deptId">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="统一社会信用代码" prop="unifiedSocialCreditCode" style="margin-left: -20px;">
<el-input v-model="deviceInfo.unifiedSocialCreditCode" style="width: 100%;" placeholder="请输入统一社会信用代码"></el-input>
@ -361,7 +341,9 @@ export default {
line-height: 60px;
}
.app-container{
box-sizing: border-box;
padding: 10px;
padding-bottom: 0px;
}
</style>

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

@ -29,7 +29,7 @@
</el-button>
</el-form-item>
</el-form>
<div style="height: 74vh;overflow: auto">
<div style="height: 73vh;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>

2
fuintAdmin_zt/src/views/setting/pay/index.vue
View File

@ -61,7 +61,7 @@
<!-- &lt;!&ndash; 列表信息&ndash;&gt;-->
<!-- <el-card style="margin-top: 20px" >-->
<div style="height: 70vh;overflow: auto">
<div style="height: 71vh;overflow: auto">
<el-table :data="tableData" style="width: 100%">
<el-table-column type="index" label="序号"></el-table-column>
<el-table-column prop="deptName" label="机构名称"></el-table-column>

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);
}
`
/**
* 交易对账
* 交易明细分页查询