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

10.28

Browse Source
This commit is contained in:
ds 2024-10-28 18:02:31 +08:00
parent 6c77a34048
commit 1d27ad0873
14 changed files with 67 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
fuintAdmin_zt/src/views/Site/add.vue
View File

@ -60,13 +60,13 @@ export default {
if (this.isCashier) {
show = true
}
let data = {
id: 0,
label: '收银台',
childrens: [],
list: [{id: 0,show: show, name: '选中菜单'},]
}
this.tableData.push(data);
// let data = {
// id: 0,
// label: '收银台',
// childrens: [],
// list: [{id: 0,show: show, name: '选中菜单'},]
// }
// this.tableData.push(data);
this.tableData.push(...response.data);
});
},

24
fuintAdmin_zt/src/views/components/Service/payment.vue
View File

@ -281,8 +281,8 @@
<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-select prop="merchConfigId" v-model="item.merchConfigId" placeholder="请选择支付通道" style="width: 300px"
<el-form-item label="支付通道" :label-width="formLabelWidth" style="margin-left: -20px;">
<el-select prop="merchConfigId" v-model="item.merchConfigId" placeholder="请选择支付通道" style="width: 350px"
@change="chooseMerchConfig(item.merchConfigId,index)">
<el-option
v-for="(item1,i) in merchantList"
@ -291,13 +291,13 @@
:value="item1.id"></el-option>
</el-select>
</el-form-item>
<el-form-item label="商户号编号" :label-width="formLabelWidth">
<el-form-item label="商户号编号" :label-width="formLabelWidth" style="margin-left: 20px;">
<el-input v-model="item.mchntCd" placeholder="请输入商户号编号" autocomplete="off"
style="width: 300px" disabled></el-input>
style="width: 350px" disabled></el-input>
</el-form-item>
<el-form-item label="交易占比" :label-width="formLabelWidth">
<el-form-item label="交易占比" :label-width="formLabelWidth" style="margin-left: -20px;">
<el-input v-model="item.proportion" placeholder="请输入交易占比" autocomplete="off" style="width: 300px">
<el-input v-model="item.proportion" placeholder="请输入交易占比" autocomplete="off" style="width: 350px">
<template slot="append">%</template>
</el-input>
</el-form-item>
@ -307,8 +307,8 @@
<div class="d-s" v-for="(item,index) in formRule.ruleList" :key="index" style="margin-bottom: 15px"
v-if=" formRule.ruleType == 2">
<div class="list-box">
<el-form-item label="支付通道" :label-width="formLabelWidth">
<el-select v-model="item.merchConfigId" placeholder="请选择支付通道" style="width: 300px"
<el-form-item label="支付通道" :label-width="formLabelWidth" style="margin-left: -20px;">
<el-select v-model="item.merchConfigId" placeholder="请选择支付通道" style="width: 350px"
@change="chooseMerchConfig(item.merchConfigId,index)">
<el-option
v-for="(item1,i) in merchantList"
@ -317,12 +317,12 @@
:value="item1.id"></el-option>
</el-select>
</el-form-item>
<el-form-item label="商户号编号" :label-width="formLabelWidth">
<el-form-item label="商户号编号" :label-width="formLabelWidth" style="margin-left: 20px;">
<el-input v-model="item.mchntCd" placeholder="请输入商户号编号" autocomplete="off"
style="width: 300px" disabled></el-input>
style="width: 350px" disabled></el-input>
</el-form-item>
<el-form-item label="交易类型" :label-width="formLabelWidth">
<el-select v-model="item.transactionType" multiple placeholder="请选择交易类型" style="width: 300px">
<el-form-item label="交易类型" :label-width="formLabelWidth" style="margin-left: -20px;">
<el-select v-model="item.transactionType" multiple placeholder="请选择交易类型" style="width: 350px">
<el-option label="会员充值" value="1"></el-option>
<el-option label="便利店" value="2"></el-option>
<el-option label="积分商城" value="3"></el-option>

3
fuintAdmin_zt/src/views/components/Service/way.vue
View File

@ -99,7 +99,8 @@ export default {
active-value="qy"
inactive-value="jy"
active-color="#13ce66"
inactive-color="#ff4949">
inactive-color="#ff4949"
disabled>
</el-switch>
</div>
</div>

10
fuintAdmin_zt/src/views/financialStatement/dai_yunyingfenxi/list.vue
View File

@ -1,7 +1,7 @@
<template>
<div class="app-center">
<div class="app-top">
<el-card :body-style="{ padding: '0px' }">
<el-card :body-style="{ padding: '0px' }" style="margin-top: 1px;">
<div class="box">
<div class="nbox" :class="pointerClass" @click="updateRedio('支付方式分析')">
<div class="fount-box" :style="{ color: radio1 === '支付方式分析' ? '#FF770F' : '#999999' }">支付方式分析</div>
@ -77,13 +77,13 @@ export default {
}
.box{
cursor: pointer;
margin-top: 10px ;
/* margin-top: 10px ; */
margin-left: 50px;
//height: 40px;
height: 68px;
display: flex;
background-color: #FFFFFF;
align-items: center;
//border: 1px solid #EBEEF5;
border: 0px solid #EBEEF5;
}
.nbox{
margin-right: 30px;
@ -97,7 +97,7 @@ export default {
color: #999999
}
.heng-box{
/* background-color: #FF770F; */
background-color: #FF770F;
width: 100%;
height: 2px;
margin-top: 10px;

6
fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/list.vue
View File

@ -1,7 +1,7 @@
<template>
<div class="app-center">
<div class="app-top">
<el-card :body-style="{ padding: '0px' }">
<el-card :body-style="{ padding: '0px'}" style="margin-top: 1px;">
<div class="box">
<div class="nbox" :class="pointerClass" @click="updateRedio('会员充值订单')">
<div class="fount-box" :style="{ color: radio1 === '会员充值订单' ? '#FF770F' : '#999999' }">会员充值订单</div>
@ -97,7 +97,7 @@ export default {
margin-left: 50px;
//height: 40px;
display: flex;
background-color: #FFFFFF;
background-color: #FFFFFF;
align-items: center;
//border: 1px solid #EBEEF5;
}
@ -113,7 +113,7 @@ background-color: #FFFFFF;
color: #999999
}
.heng-box{
/* background-color: #FF770F; */
background-color: #FF770F;
width: 100%;
height: 2px;
margin-top: 10px;

2
fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/list.vue
View File

@ -1,7 +1,7 @@
<template>
<div class="app-center">
<div class="app-top">
<el-card :body-style="{ padding: '0px' }">
<el-card :body-style="{ padding: '0px' }" style="margin-top: 1px;">
<div class="box">
<div class="nbox" :class="pointerClass" @click="updateRedio('会员分析')">
<div class="fount-box" :style="{ color: radio1 === '会员分析' ? '#FF770F' : '#999999' }">会员分析</div>

22
fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/int.vue
View File

@ -63,24 +63,24 @@
<el-table
:data="orderList"
style="width: 100%">
<el-table-column type="index" width="50" align="center" label="序号"/>
<el-table-column prop="storeName" label="机构名称" width="150" align="center"></el-table-column>
<el-table-column prop="paidInfo" label="累计交易金额 (元)" width="150" align="center">
<el-table-column type="index" width="100" align="center" label="序号"/>
<el-table-column prop="storeName" label="机构名称" width="200" align="center"></el-table-column>
<el-table-column prop="paidInfo" label="累计交易金额 (元)" width="200" align="center">
<template>
{{this.orderStatistics.paidInfo}}
</template>
</el-table-column>
<el-table-column prop="count" label="累计交易笔数" width="150" align="center"></el-table-column>
<el-table-column prop="exchangeQuantity" label="兑换商品数量" width="150" align="center"></el-table-column>
<el-table-column prop="integral" label="累计消费积分" width="150" align="center"></el-table-column>
<el-table-column prop="count" label="累计交易笔数" width="160" align="center"></el-table-column>
<el-table-column prop="exchangeQuantity" label="兑换商品数量" width="160" align="center"></el-table-column>
<el-table-column prop="integral" label="累计消费积分" width="160" align="center"></el-table-column>
<el-table-column label="热门商品信息" align="center">
<el-table-column prop="giftName" label="商品名称" width="150" align="center"></el-table-column>
<el-table-column prop="exchangeQuantityBy" label="兑换数量 (件)" width="150"
<el-table-column prop="giftName" label="商品名称" width="160" align="center"></el-table-column>
<el-table-column prop="exchangeQuantityBy" label="兑换数量 (件)" width="160"
align="center"></el-table-column>
<el-table-column prop="paidInfo" label="销售金额 (元)" width="150" align="center"></el-table-column>
<el-table-column prop="integralBy" label="消费积分" width="150" align="center"></el-table-column>
<el-table-column prop="paidInfo" label="销售金额 (元)" width="160" align="center"></el-table-column>
<el-table-column prop="integralBy" label="消费积分" width="160" align="center"></el-table-column>
</el-table-column>
<el-table-column prop="statDate" label="统计日期" width="200" align="center">
<el-table-column prop="statDate" label="统计日期" width="400" align="center">
<template>
{{this.value2[0]}} 至 {{this.value2[1]}}
</template>

2
fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/vip.vue
View File

@ -256,7 +256,7 @@ import {getFenXiUserbalanceDataApi, getFenXiUserbalanceListApi} from "@/api/fina
width: 100%;
display: flex;
align-items: center;
//margin-bottom: 15px;
margin-bottom: 15px;
}
.k_{
width: 200px;

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

@ -196,7 +196,7 @@ export default {
appId: [{required: true, message: '请填写小程序appID', trigger: 'blur'},],
appKey: [{required: true, message: '请填写密钥', trigger: 'blur'},],
legalRepresentativeName: [{required: true, message: '请填写法人姓名', trigger: 'blur'},],
legalRepresentativeWechat: [{required: true, message: '请填写法人微信号', trigger: 'blur'},],
// legalRepresentativeWechat: [{required: true, message: '请填写法人微信号', trigger: 'blur'},],
legalRepresentativeContact: [{required: true, message: '请填写法人联系方式', trigger: 'blur'},],
},
// 是否显示弹出层

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

@ -285,9 +285,9 @@ export default {
sortOrder: [
{ required: true, message: '请填写排序号', trigger: 'blur' }
],
bannerLink: [
{ required: true, message: '请填写链接', trigger: 'blur' }
],
// bannerLink: [
// { required: true, message: '请填写链接', trigger: 'blur' }
// ],
bannerStatus: [
{ required: true, message: '请选择banner图状态', trigger: 'blur' }
]

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

@ -96,13 +96,13 @@
<el-dialog :title="title" :close-on-click-modal="false" :visible.sync="open" width="30%" append-to-body>
<el-form ref="form" :rules="rules" :model="form" label-width="120px">
<el-form-item label="短信模板ID" prop="messageId">
<el-form-item label="短信模板ID" prop="messageId" style="margin-left: -25px;">
<el-input v-model="form.messageId" style="width: 100%"></el-input>
</el-form-item>
<el-form-item label="短信名称" prop="name">
<el-form-item label="短信名称" prop="name" style="margin-left: -25px;">
<el-input v-model="form.name" style="width: 100%"></el-input>
</el-form-item>
<el-form-item label="适用范围" prop="deptIdList">
<el-form-item label="适用范围" prop="deptIdList" style="margin-left: -25px;">
<el-select v-model="form.deptIdList" multiple placeholder="请选择所属机构" style="width: 100%">
<el-option
v-for="item in deptListSelect"
@ -113,7 +113,7 @@
</el-select>
</el-form-item>
<el-form-item label="状态" prop="status">
<el-form-item label="状态" prop="status" style="margin-left: -25px;">
<el-switch
v-model="form.status"
active-value="1"
@ -132,7 +132,7 @@
<!-- />-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item label="短信内容" prop="content" >
<el-form-item label="短信内容" prop="content" style="margin-left: -25px;" >
<el-input type="textarea" v-model="form.content" style="width: 100%"></el-input>
</el-form-item>
</el-form>

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

@ -136,7 +136,7 @@
<el-dialog :title="title" :close-on-click-modal="false" :visible.sync="open" width="30%" append-to-body>
<el-form :model="deviceInfo" ref="deviceForm" label-width="120px" :rules="rules">
<el-form-item label="机构名称" prop="deptId" >
<el-form-item label="机构名称" prop="deptId" style="margin-left: -30px;" >
<el-select v-model="deviceInfo.deptId" placeholder="请选择机构" @change="chooseDept(deviceInfo.deptId)" style="width: 100%">
<el-option
v-for="item in deptListSelect"
@ -146,7 +146,7 @@
></el-option>
</el-select>
</el-form-item>
<el-form-item label="机构类型" prop="deptType">
<el-form-item label="机构类型" prop="deptType" style="margin-left: -30px;" >
<el-select v-model="deviceInfo.deptType" placeholder="请选择机构类型" clearable disabled style="width: 100%">
<el-option label="代理商" value="1"></el-option>
<el-option label="连锁店" value="2"></el-option>
@ -154,7 +154,7 @@
<el-option label="三方机构" value="4"></el-option>
</el-select>
</el-form-item>
<el-form-item label="支付通道" prop="paymentChannel">
<el-form-item label="支付通道" prop="paymentChannel" style="margin-left: -30px;">
<el-select v-model="deviceInfo.paymentChannel" placeholder="请选择支付通道" clearable style="width: 100%">
<el-option
v-for="dict in dict.type.payment_channel"
@ -164,25 +164,25 @@
/>
</el-select>
</el-form-item>
<el-form-item label="机构号" prop="" v-if="deviceInfo.paymentChannel!='富友'">
<el-form-item label="机构号" prop="" v-if="deviceInfo.paymentChannel!='富友'" style="margin-left: -30px;">
<el-input v-model="deviceInfo.insCd" style="width: 100%"></el-input>
</el-form-item>
<el-form-item label="机构号" prop="insCd" v-else>
<el-form-item label="机构号" prop="insCd" v-else style="margin-left: -30px;">
<el-input v-model="deviceInfo.insCd" style="width: 100%"></el-input>
</el-form-item>
<el-form-item label="公钥" prop="publicKey">
<el-form-item label="公钥" prop="publicKey" style="margin-left: -30px;">
<el-input v-model="deviceInfo.publicKey" style="width: 100%"></el-input>
</el-form-item>
<el-form-item label="私钥" prop="privateKey">
<el-form-item label="私钥" prop="privateKey" style="margin-left: -30px;">
<el-input v-model="deviceInfo.privateKey" style="width: 100%"></el-input>
</el-form-item>
<el-form-item label="联系人" prop="contact">
<el-form-item label="联系人" prop="contact" style="margin-left: -30px;">
<el-input v-model="deviceInfo.contact" style="width: 100%"></el-input>
</el-form-item>
<el-form-item label="联系方式" prop="information">
<el-form-item label="联系方式" prop="information" style="margin-left: -30px;">
<el-input v-model="deviceInfo.information" style="width: 100%"></el-input>
</el-form-item>
<el-form-item label="支付状态" prop="appStatus" >
<el-form-item label="支付通道状态" prop="appStatus" style="margin-left: -25px;" >
<el-switch
v-model="deviceInfo.status"
active-value="qy"

3
fuintCashierWeb/src/views/cashier/NewComponents/Integral.vue
View File

@ -169,7 +169,8 @@
</div>
</div>
<div class="wrap-right-bottom">
<div class="chongzhi" @click="reset()"><i class="el-icon-refresh"></i> 重置</div>
<el-button style="margin-left: 20px;" class="el-icon-refresh" @click="reset()"> 重 置</el-button>
<!-- <div class="chongzhi" @click="reset()"><i class="el-icon-refresh"></i> 重置</div> -->
<div style="display: flex;align-items: center">
<div class="ddjil" @click="orderHistoryMethod">订单记录</div>
<div class="gwuc" @click="shoppingCartMethod()">

3
fuintCashierWeb/src/views/cashier/NewComponents/newHome.vue
View File

@ -852,7 +852,8 @@ export default {
computed: {
getChangeShould() {
return this.payForm.authCode - this.payForm.realyPayBills
let change = this.payForm.authCode - this.payForm.realyPayBills;
return change.toFixed(2);
},
getGoodsItem() {
if (this.oilGunClearing.amount && this.oilGunClearing.amount !== undefined) {