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

11.15

Browse Source
This commit is contained in:
DESKTOP-369JRHT\12997 2024-11-18 09:58:56 +08:00
parent 37df8802d3
commit 318a762c76
6 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fuintAdmin/src/views/power/banner.vue
View File

@ -1,6 +1,6 @@
<template>
<div class="app-conts">
<div class="card-change" style="height: 91vh;">
<div class="card-change" style="height: 92vh;">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
<el-form-item label="" prop="name">
<el-input
@ -362,8 +362,8 @@ export default {
width: 100%;
box-sizing: border-box;
padding: 10px;
min-height: 90vh;
background: #f6f8f9;
padding-bottom: 0px;
}
.common-dialog >>> .el-upload--picture-card {
width: 60px;

2
fuintAdmin/src/views/power/linkManage.vue
View File

@ -34,7 +34,6 @@
<el-button type="primary" @click="handleAdd">新增链接</el-button>
</el-form-item>
</el-form>
<div style="height: 77vh;overflow: auto">
<el-table :data="tableData" style="width: 100%" border>
<el-table-column type="index" align="center" label="序号"></el-table-column>
@ -242,5 +241,6 @@ export default {
.app-container{
box-sizing: border-box;
padding-bottom: 0px;
padding: 10px;
}
</style>

8
fuintAdmin/src/views/power/message.vue
View File

@ -438,13 +438,13 @@
<el-option label="小于" value="小于"></el-option>
<!-- 添加其他选项 -->
</el-select>
<el-input v-model="form.fleetAmount" v-if="form.sendCondition==2" placeholder="请输入车队的总余额" style="width: 200px;margin-right: 10px">
<el-input v-model="form.fleetAmount" v-if="form.sendCondition==2" placeholder="请输入车队的余额" style="width: 200px;margin-right: 10px">
<template slot="append">元</template>
</el-input>
<el-input v-model="form.creditAmount" v-if="form.sendCondition==1" placeholder="请输入剩余可挂账额度" style="width: 200px;margin-right: 10px">
<template slot="append">元</template>
</el-input>
<el-input v-model="form.goodsStock" v-else placeholder="请输入商品库存" style="width: 200px;margin-right: 10px">
<el-input v-model="form.goodsStock" v-if="form.sendCondition!=2" placeholder="请输入商品库存" style="width: 200px;margin-right: 10px">
<template slot="append">件</template>
</el-input>
</div>
@ -1155,7 +1155,9 @@ export default {
box-sizing: border-box;
padding: 15px;
margin: 10px;
height: 86vh;
margin-bottom: 0px;
padding-bottom: 0px;
height: 87vh;
}
.common-dialog > > > .el-upload--picture-card {

1
fuintAdmin/src/views/power/page/mode.vue
View File

@ -285,6 +285,7 @@ export default {
handleSubmit(formName) {
this.$refs[formName].validate((valid) =>{
this.form.recipientRoles = this.form.recipientRoles.toString()
if (valid) {
// 表单验证通过，可以提交数据
this.open = false

2
fuintAdmin/src/views/power/page/record.vue
View File

@ -272,7 +272,7 @@ export default {
type: 'warning'
}).then(() => {
getSendNotifyApi({id: data}).then(res => {
if (res.data == true) {
if (res.code == 200) {
this.$message({
type: 'success',
message: '发送成功!'

20
fuintAdmin/src/views/power/payment/index.vue
View File

@ -11,6 +11,7 @@
</div>
<div class="o-button" v-hasPermi="['Merchant:add']" @click="addMerchantShow()">新增商户信息</div>
</div>
<div class="table_">
<el-table
:data="merchantList"
border
@ -82,6 +83,7 @@
</template>
</el-table-column>
</el-table>
</div>
<div class="n-top-box" style="margin-top: 30px">
<div class="d-s">
<div class="gang"></div>
@ -92,6 +94,7 @@
</div>
<div class="o-button" v-hasPermi="['payment:add']" @click="addRules()">新增规则</div>
</div>
<div class="table_">
<el-table
:data="tableData1"
style="width: 100%;margin-bottom: 20px;"
@ -197,6 +200,7 @@
</el-table-column>
</el-table>
</div>
</div>
<el-dialog center :close-on-click-modal="false" :title="addMerchantTitile" :visible.sync="addMerchants" width="28%">
<el-form :model="form" ref="formAdd" :rules="rules" :inline="true">
<el-form-item label="所属机构" style="margin-right: 0px" :label-width="formLabelWidth" prop="deptId">
@ -266,7 +270,7 @@
<div class="d-s" v-for="(item,index) in formRule.ruleList" :key="index" style="margin-bottom: 15px"
v-if=" formRule.ruleType == 1">
<div class="list-box">
<el-form-item label="支付通道" :label-width="formLabelWidth">
<el-form-item label="支付通道" label-width="80px">
<el-select prop="merchConfigId" v-model="item.merchConfigId" placeholder="请选择支付通道" style="width: 300px"
@change="chooseMerchConfig(item.merchConfigId,index)">
<el-option
@ -276,11 +280,11 @@
:value="item1.id"></el-option>
</el-select>
</el-form-item>
<el-form-item label="商户号编号" :label-width="formLabelWidth">
<el-form-item label="商户号编号" label-width="120px">
<el-input v-model="item.mchntCd" placeholder="请输入商户号编号" autocomplete="off"
style="width: 300px" disabled></el-input>
</el-form-item>
<el-form-item label="交易占比" :label-width="formLabelWidth">
<el-form-item label="交易占比" label-width="80px">
<el-input v-model="item.proportion" placeholder="请输入交易占比" autocomplete="off" style="width: 300px">
<template slot="append">%</template>
@ -351,7 +355,6 @@
<el-button type="primary" @click="submitEnable('qy')">确 定</el-button>
</div>
</el-dialog>
<el-dialog center :close-on-click-modal="false" :title="title" :visible.sync="dialogVisible" width="30%">
<el-form :model="form1" ref="form1" :rules="rules" label-width="100px">
<el-form-item label="支付通道" :label-width="formLabelWidth" prop="merchantName" width="300px">
@ -381,7 +384,6 @@
<el-button type="primary" @click="submitMerchant">确 定</el-button>
</span>
</el-dialog>
<el-dialog center :close-on-click-modal="false" :title="title" :visible.sync="show" width="25%" style="margin-top: 200px">
<span>请输入备注信息</span>
<el-input placeholder="请输入备注信息" style="margin-top: 20px"
@ -1044,12 +1046,16 @@ export default {
width: 100%;
background: #f9f9f9;
box-sizing: border-box;
padding: 20px;
padding: 10px;
}
.table_{
width: 100%;
box-sizing: border-box;
}
.new-box {
width: 100%;
height: 89vh;
height: 91vh;
overflow: auto;
background: #fff;
box-sizing: border-box;