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

Merge branch 'master' of http://192.168.31.244:3000/byx/oilSystem

Browse Source 
# Conflicts:
#	fuintAdmin_zt/.env.development
#	fuintAdmin_zt/src/views/Site/index.vue
#	fuintAdmin_zt/src/views/setting/sysLog.vue
#	fuintBackend/fuint-application/src/main/resources/application.properties
This commit is contained in:
DESKTOP-369JRHT\12997 2024-07-27 16:32:53 +08:00
commit 93161691a6
41 changed files with 993 additions and 878 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fuintAdmin_zt/.env.development
View File

@ -12,8 +12,10 @@ VUE_APP_PUBLIC_PATH = '/'
# 后端接口地址
#VUE_APP_SERVER_URL = 'http://192.168.31.72:8081/'
VUE_APP_SERVER_URL = 'http://192.168.31.178:8081/'
# cp端地址
# VUE_PC_SERVER_URL = 'http://192.168.31.72:8081/'
# VUE_PC_SERVER_URL = 'http://47.95.206.185:85/'

8
fuintAdmin_zt/src/api/store.js
View File

@ -47,3 +47,11 @@ export function saveStore(data) {
data: data
})
}
// 保存店铺
export function getStoreListByDeptId(deptId) {
return request({
url: 'backendApi/store/getStoreByDeptId/'+deptId,
method: 'get',
})
}

BIN
fuintAdmin_zt/src/assets/images/danxuan_c.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 387 B

BIN
fuintAdmin_zt/src/assets/images/danxuan_h.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 394 B

24
fuintAdmin_zt/src/layout/components/Navbar.vue
View File

@ -46,25 +46,7 @@
</el-dropdown-menu>
</el-dropdown>
</div>
<el-dialog
title="提示"
:visible.sync="dialogVisible"
width="30%"
:before-close="handleClose">
<el-form-item label="密码" prop="name">
<el-input v-model="ruleForm.name"></el-input>
</el-form-item>
<el-form-item label="新密码" prop="name">
<el-input v-model="ruleForm.name"></el-input>
</el-form-item>
<el-form-item label="确认密码" prop="name">
<el-input v-model="ruleForm.name"></el-input>
</el-form-item>
<span slot="footer" class="dialog-footer">
<el-button @click="dialogVisible = false">取 消</el-button>
<el-button type="primary" @click="prsswrod()">确 定</el-button>
</span>
</el-dialog>
</div>
@ -127,8 +109,7 @@ export default {
done();
})
.catch(_ => {});
}
},
},
prsswrod(){
console.log('方法')
this.dialogVisible = false
@ -148,6 +129,7 @@ export default {
})
}).catch(() => {});
}
},
}
</script>

2
fuintAdmin_zt/src/layout/components/Sidebar/index.vue
View File

@ -20,7 +20,7 @@
>
<sidebar-item
v-for="(route, index) in sidebarRouters"
:key="route.path + index"
:key="route.path + index"
:item="route"
:base-path="route.path"
:activeMenu="activeMenu"

2
fuintAdmin_zt/src/views/Service/details.vue
View File

@ -11,7 +11,7 @@
<jcindex :id="id" v-if="tabindex == 0"></jcindex>
<payment :id="id" :deptId="deptId" v-if="tabindex == 1" ></payment>
<way :id="id" :deptId="deptId" v-if="tabindex == 2" ></way>
<staff :id="id" v-if="tabindex == 3" ></staff>
<staff :id="id" :deptId="deptId" v-if="tabindex == 3" ></staff>
<allOrder :id="id" v-if="tabindex == 4"></allOrder>
<!-- <el-card >-->

10
fuintAdmin_zt/src/views/Site/components/afterff.vue
View File

@ -14,7 +14,15 @@ export default {
return {
dialogVisible:false,
dialogVisible2:false,
tableData: [ ],
tableData: [{
price:2000,
yprice:2500,
date: '2016-05-02',
name: '王小虎',
address: '上海市普陀区金沙江路 1518 弄',
status:'进行中',
upadate: '2016-05-02',
}, ],
form: {
deductionRate: '', // 扣点费率
likelyTransactionVolume: '0', // 已发生交易流量

3
fuintAdmin_zt/src/views/Site/components/before.vue
View File

@ -129,7 +129,7 @@ export default {
<el-table
:data="tableData"
border
style="width: 95%;margin-left: 55px ">
style="width: 90%;margin-left: 55px ">
<el-table-column
prop="prepaidAmount"
align="center"
@ -175,7 +175,6 @@ export default {
<template slot="header" slot-scope="scope">
<el-button
size="mini"
type="success" plain
@click="handleUpdate1(scope.row)"
>新增</el-button>
</template>

3
fuintAdmin_zt/src/views/Site/components/yearff.vue
View File

@ -92,7 +92,7 @@ export default {
<el-table
:data="tableData"
border
style="width: 95%;margin-left: 55px ">
style="width: 80%;margin-left: 55px ">
<el-table-column
prop="price"
align="center"
@ -137,7 +137,6 @@ export default {
<el-button
size="mini"
@click="dialogVisible=true"
type="success" plain
>新增</el-button>
</template>
<template slot-scope="scope">

43
fuintAdmin_zt/src/views/Site/index.vue
View File

@ -105,7 +105,6 @@
</el-button>
</el-form-item>
</el-form>
<el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange" border>
<el-table-column type="selection" width="50" align="center" />
@ -286,8 +285,7 @@
</span>
</span>
</el-form-item>
<!-- <template v-if="ruleForm.deptType !== '3'">-->
<template v-if="is2Store">
<template v-if="ruleForm.deptType !== '3'">
<el-row >
<el-col :span="20">
<el-form-item label="计费方式" prop="turnoverType">
@ -538,6 +536,7 @@
<el-form-item style="float: right;margin-right: 0px">
<el-button type="primary" icon="el-icon-search" @click="handleQuery1">查询</el-button>
<el-button icon="el-icon-refresh" @click="reset2">重置</el-button>
<el-button
type="warning"
plain
@ -607,8 +606,6 @@
</template>
</el-table-column>
</el-table>
<pagination
v-show="total1>0"
:total="total1"
@ -840,9 +837,6 @@ export default {
}
};
return {
// 判断是否是二级门店
is2Store:false,
maxNumber:1,
storeNum: false,
isEditDept:true,
@ -1325,18 +1319,6 @@ export default {
this.queryParams1.page = 1;
this.getDutyList();
},
//重置校色信息
reset2(){
this.queryParams1 = {
page:1,
pageSize:10,
// 当做机构id使用
storeId:"",
deptId:''
}
this.getDutyList();
},
getDutyList(){
this.loading = true;
dutyList(this.queryParams1).then(res => {
@ -1413,7 +1395,7 @@ export default {
let evenNumbers = typeList
// isClick
if (this.deptType == 3 || (this.deptType == 2 && !this.isClick)) {
evenNumbers = typeList.filter(number => number.label === "单油站");
evenNumbers = typeList.filter(number => number.label === "基本门店");
this.ruleForm.deptType = "3"
}
return evenNumbers
@ -1609,11 +1591,6 @@ export default {
event.stopPropagation();
this.isAdd = true
// 新增树
if (data.id == 100) {
this.is2Store = true
}else {
this.is2Store = true
}
},
cleanRuleForm() {
this.ruleForm= {
@ -1679,15 +1656,9 @@ export default {
Userlist(id).then(res=>{
let ancestors = res.data.ancestors.slice(2).toString();
this.parentName = res.data.parentName
this.ruleForm = res.data
if (this.ruleForm.parentId == 100) {
this.is2Store = true
}else {
this.is2Store = false
}
// this.ruleForm.parentId = res.data.parentId
// this.ruleForm.status = res.data.status
@ -2018,14 +1989,6 @@ export default {
password:'',
accountStatus:1
}
this.queryParams= {
pageNum: 1,
pageSize: 10,
userName: '',
phonenumber: '',
status: '',
deptId: ''
}
},
/** 修改按钮操作 */

79
fuintAdmin_zt/src/views/components/Service/allOrder.vue
View File

@ -4,6 +4,15 @@
<div class="bai-box" style="margin-top: 20px" >
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="" prop="orderNo">
<el-input
v-model="queryParams.orderNo"
placeholder="请输入订单号"
clearable
style="width: 240px;"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="type">
<el-select
v-model="queryParams.type"
@ -20,15 +29,6 @@
</el-select>
</el-form-item>
<el-form-item label="" prop="orderNo">
<el-input
v-model="queryParams.orderNo"
placeholder="请输入订单号"
clearable
style="width: 240px;"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="payChannel">
<el-select
@ -83,47 +83,66 @@
</el-form-item>
</el-form>
<el-table ref="tables" border v-loading="loading" :data="list" @selection-change="handleSelectionChange" :default-sort="defaultSort" @sort-change="handleSortChange">
<el-table-column label="订单号" align="center" prop="orderNo" />
<el-table-column label="订单类型" align="center" prop="type" width="100">
<el-table-column label="序号" align="center" type="index" />
<el-table-column label="订单号" align="center" prop="orderNo" width="220"/>
<el-table-column label="所属机构" align="center" prop="type" width="200">
<template slot-scope="scope">
{{ getType(scope.row.type) }}
</template>
</el-table-column>
<el-table-column label="渠道订单号" align="center" prop="transactionId"/>
<el-table-column :label="sumPayMoney" align="center" prop="payMoney">
</el-table-column>
<el-table-column label="支付时间" align="center" prop="payTime" width="150">
<el-table-column label="订单类型" align="center" prop="createTime">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.payTime) }}</span>
<span v-if="scope.row.payChannel==='applet'">小程序</span>
<span v-else-if="scope.row.payChannel==='POS'">收银台</span>
<span v-else>收银台</span>
</template>
</el-table-column>
<el-table-column label="付款方式" align="center" prop="payType">
<el-table-column label="支付方式" align="center" prop="payType">
<template slot-scope="scope">
<dict-tag :options="dict.type.payment_type" :value="scope.row.payType"/>
</template>
</el-table-column>
<el-table-column label="创建时间" align="center" prop="createTime" width="150">
<el-table-column label="订单状态" align="center" prop="status">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime) }}</span>
<dict-tag :options="dict.type.pay_status" :value="scope.row.status"/>
</template>
</el-table-column>
<el-table-column label="支付渠道" align="center" prop="createTime" width="150">
<template slot-scope="scope">
<span>{{ scope.row.payChannel==='applet'?'小程序': '收银台'}}</span>
</template>
</el-table-column>
<el-table-column label="付款用户手机号" align="center" prop="userMobile" width="150">
<el-table-column label="付款用户/手机号" align="center" prop="userMobile" width="150">
<template slot-scope="scope">
<span>{{ scope.row.userMobile?scope.row.userMobile: '散户'}}</span>
</template>
</el-table-column>
<!-- <el-table-column label="支付通道" align="center" prop="userMobile" width="150">-->
<!-- <template slot-scope="scope">-->
<!-- <span>{{ scope.row.userMobile?scope.row.userMobile: '散户'}}</span>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column label="商户号编号" align="center" prop="userMobile" width="150">-->
<!-- <template slot-scope="scope">-->
<!-- <span>{{ scope.row.userMobile?scope.row.userMobile: '散户'}}</span>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column label="订单创建时间" align="center" prop="createTime">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime) || '--'}}</span>
</template>
</el-table-column>
<el-table-column label="订单完成时间" align="center" prop="payTime">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.payTime) || '--'}}</span>
</template>
</el-table-column>
</el-table>
@ -145,7 +164,7 @@
import { getOrderListApi,getSumPayMoneyApi } from "../../../api/allOrder";
export default {
name: "asdf",
dicts: ['transaction','handover','handover_quit','payment_type',
dicts: ['transaction','handover','handover_quit','payment_type','pay_status',
'jbjl','official','notice','role'],
props: ["id"],
@ -217,7 +236,7 @@
{ value: 'applet',label: '小程序'},
{ value: 'cashier',label: '收银台'},
],
sumPayMoney:'支付金额'
sumPayMoney:'订单金额'
};
},
created() {
@ -244,9 +263,9 @@
getSumPayMoneyApi(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
if(response.data > 0) {
const sum = response.data
this.sumPayMoney = '支付金额(总计：￥'+sum+')'
this.sumPayMoney = '订单金额(总计：￥'+sum+')'
}else {
this.sumPayMoney = '支付金额'
this.sumPayMoney = '订单金额'
}
// this.loading = false;

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

@ -131,9 +131,9 @@
label="规则名称"
align="center"
width="120">
<!-- <template slot-scope="scope">-->
<!-- <div style="color: #409EFF;cursor: pointer">{{ scope.row.ruleName }}</div>-->
<!-- </template>-->
<!-- <template slot-scope="scope">-->
<!-- <div style="color: #409EFF;cursor: pointer">{{ scope.row.ruleName }}</div>-->
<!-- </template>-->
</el-table-column>
<el-table-column
@ -252,7 +252,7 @@
<el-input type="textarea" v-model="formRule.description" placeholder="请输入规则描述" autocomplete="off"
style="width: 350px"></el-input>
</el-form-item>
<el-form-item label="规则类型" :label-width="formLabelWidth">
<el-form-item label="规则类型" :label-width="formLabelWidth" prop="ruleType">
<div style="display: flex">
<div class="xz_box" :class=" {'active' : formRule.ruleType == 1 } " @click="formRule.ruleType = 1"><i
class="el-icon-aim"></i> 按比例分账
@ -274,7 +274,7 @@
<el-option
v-for="(item1,i) in merchantList"
:key="item1.id"
:label="item1.remark ? (item1.merchantName+'（'+item1.remark+'）') : (item1.merchantName+'（--）')"
:label="item1.mchntCd ? (item1.merchantName+'（'+item1.mchntCd+'）') : (item1.merchantName+'（--）')"
:value="item1.id"></el-option>
</el-select>
</el-form-item>
@ -300,7 +300,7 @@
<el-option
v-for="(item1,i) in merchantList"
:key="item1.id"
:label="item1.remark ? (item1.merchantName+'（'+item1.remark+'）') : (item1.merchantName+'（--）')"
:label="item1.mchntCd ? (item1.merchantName+'（'+item1.mchntCd+'）') : (item1.merchantName+'（--）')"
:value="item1.id"></el-option>
</el-select>
</el-form-item>
@ -344,9 +344,9 @@
style="width: 100%;"></el-date-picker>
</el-form-item>
<div style="width: 15px"></div>
<!-- <el-form-item prop="date2">-->
<!-- <el-time-picker placeholder="选择时间" v-model="ruleForm.date2" style="width: 100%;"></el-time-picker>-->
<!-- </el-form-item>-->
<!-- <el-form-item prop="date2">-->
<!-- <el-time-picker placeholder="选择时间" v-model="ruleForm.date2" style="width: 100%;"></el-time-picker>-->
<!-- </el-form-item>-->
</div>
<div style="margin-left: 80px">启用成功后其他规则的规则状态变为停用！</div>
@ -724,6 +724,9 @@ export default {
ruleName: [
{required: true, message: '请输入规则名称', trigger: 'blur'},
],
ruleType: [
{required: true, message: '请选择规则类型', trigger: 'blur'},
],
}
}
},

1091
fuintAdmin_zt/src/views/components/Service/staff.vue
View File

File diff suppressed because it is too large Load Diff

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

@ -21,7 +21,7 @@
</div>
<div class="nbox" :class="pointerClass" @click="updateRedio('积分兑换订单')">
<div class="fount-box" :style="{ color: radio1 === '积分兑换订单' ? '#FF770F' : '#999999' }">积分商城订单</div>
<div class="fount-box" :style="{ color: radio1 === '积分兑换订单' ? '#FF770F' : '#999999' }">积分兑换订单</div>
<div class="heng-box" v-if="radio1 == '积分兑换订单'"></div>
<div class="heng-box" style="background-color: #FFFFFF" v-else></div>
</div>

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

@ -1,6 +1,6 @@
<!-- 收银台订单-->
<template>
<div style="margin-top: 0px;margin-right: 40px">
<div style="margin-top: 0px">
<el-card class="box-card">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px">
<el-form-item label="" prop="deptId" style="width: 180px">
@ -43,11 +43,11 @@
<el-select
v-model="queryParams.status"
clearable
placeholder="订单状态"
placeholder="支付状态"
>
<el-option label="支付成功" value="paid"/>
<el-option label="待支付" value="unpaid"/>
<el-option label="退款成功" value="refund"/>
<el-option label="已支付" value="paid"/>
<el-option label="未支付" value="unpaid"/>
<el-option label="已退款" value="refund"/>
</el-select>
</el-form-item>
<el-form-item label="">
@ -69,7 +69,7 @@
<el-form-item class="" style="float: right;margin-right:0px">
<el-form-item class="" 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>
</el-form-item>
@ -83,7 +83,7 @@
<el-table-column type="index" width="50" align="center" label="序号"/>
<el-table-column prop="storeName" align="center" label="机构名称"> </el-table-column>
<el-table-column prop="orderNumber" align="center" label="订单号" > </el-table-column>
<el-table-column prop="amount" align="center" label="订单金额（元）">
<el-table-column prop="amount" align="center" label="订单金额（万元）">
<template slot-scope="scope">
<span v-if="scope.row.amount">{{scope.row.amount}}</span>
<span v-else>--</span>
@ -93,7 +93,7 @@
<template slot-scope="scope">
<span v-if="scope.row.payChannel=='cashier'">收银台</span>
<span v-else-if="scope.row.payChannel=='POS'">POS机</span>
<span v-else-if="scope.row.payChannel=='PC'">收银台</span>
<span v-else-if="scope.row.payChannel=='PC'">平台</span>
<span v-else-if="scope.row.payChannel=='applet'">小程序</span>
<span v-else>其他</span>
</template>
@ -108,9 +108,9 @@
</el-table-column>
<el-table-column prop="status" align="center" label="支付状态">
<template slot-scope="scope">
<el-tag v-if="scope.row.status == 'unpaid'">待支付</el-tag>
<el-tag type="success" v-else-if="scope.row.status == 'paid'">支付成功</el-tag>
<el-tag type="danger" v-else-if="scope.row.status == 'refund'">退款成功</el-tag>
<el-tag v-if="scope.row.status == 'unpaid'">未支付</el-tag>
<el-tag type="success" v-else-if="scope.row.status == 'paid'">已支付</el-tag>
<el-tag type="danger" v-else-if="scope.row.status == 'refund'">已退款</el-tag>
<el-tag type="danger" v-else>支付失败</el-tag>
</template>
</el-table-column>

22
fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/oil.vue
View File

@ -1,6 +1,6 @@
<!-- 收银台订单-->
<template>
<div style="margin-top: 0px;margin-right: 40px">
<div style="margin-top: 0px">
<el-card class="box-card">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px">
<el-form-item label="" prop="deptId" style="width: 180px">
@ -43,11 +43,11 @@
<el-select
v-model="queryParams.orderStatus"
clearable
placeholder="订单状态"
placeholder="支付状态"
>
<el-option label="支付成功" value="paid"/>
<el-option label="待支付" value="unpaid"/>
<el-option label="退款成功" value="refund"/>
<el-option label="已支付" value="paid"/>
<el-option label="未支付" value="unpaid"/>
<el-option label="已退款" value="refund"/>
</el-select>
</el-form-item>
<el-form-item label="">
@ -69,7 +69,7 @@
<el-form-item class="" style="float: right;margin-right:0px">
<el-form-item class="" 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>
</el-form-item>
@ -85,12 +85,12 @@
<el-table-column type="index" width="50" align="center" label="序号"/>
<el-table-column prop="storeName" align="center" label="机构名称"> </el-table-column>
<el-table-column prop="orderNo" align="center" label="订单号" > </el-table-column>
<el-table-column prop="payAmount" align="center" label="订单金额（元）"></el-table-column>
<el-table-column prop="payAmount" align="center" label="订单金额（万元）"></el-table-column>
<el-table-column prop="terminal" align="center" label="订单类型">
<template slot-scope="scope">
<span v-if="scope.row.terminal=='cashier'">收银台</span>
<span v-else-if="scope.row.terminal=='POS'">POS机</span>
<span v-else-if="scope.row.terminal=='PC'">收银台</span>
<span v-else-if="scope.row.terminal=='PC'">平台</span>
<span v-else-if="scope.row.terminal=='applet'">小程序</span>
<span v-else>其他</span>
</template>
@ -105,9 +105,9 @@
</el-table-column>
<el-table-column prop="orderStatus" align="center" label="支付状态">
<template slot-scope="scope">
<el-tag v-if="scope.row.orderStatus == 'unpaid'">待支付</el-tag>
<el-tag type="success" v-else-if="scope.row.orderStatus == 'paid'">支付成功</el-tag>
<el-tag type="danger" v-else-if="scope.row.orderStatus == 'refund'">退款成功</el-tag>
<el-tag v-if="scope.row.orderStatus == 'unpaid'">未支付</el-tag>
<el-tag type="success" v-else-if="scope.row.orderStatus == 'paid'">已支付</el-tag>
<el-tag type="danger" v-else-if="scope.row.orderStatus == 'refund'">已退款</el-tag>
<el-tag type="danger" v-else>支付失败</el-tag>
</template>
</el-table-column>

22
fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/store.vue
View File

@ -1,6 +1,6 @@
<!-- 收银台订单-->
<template>
<div style="margin-top: 0px;margin-right: 40px">
<div style="margin-top: 0px">
<el-card class="box-card">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px">
<el-form-item label="" prop="deptId" style="width: 180px">
@ -43,11 +43,11 @@
<el-select
v-model="queryParams.status"
clearable
placeholder="订单状态"
placeholder="支付状态"
>
<el-option label="支付成功" value="paid"/>
<el-option label="待支付" value="unpaid"/>
<el-option label="退款成功" value="refund"/>
<el-option label="已支付" value="paid"/>
<el-option label="未支付" value="unpaid"/>
<el-option label="已退款" value="refund"/>
</el-select>
</el-form-item>
<el-form-item label="">
@ -69,7 +69,7 @@
<el-form-item class="" style="float: right;;margin-right:0px">
<el-form-item class="" 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>
</el-form-item>
@ -83,12 +83,12 @@
<el-table-column type="index" width="50" align="center" label="序号"/>
<el-table-column prop="storeName" align="center" label="机构名称"> </el-table-column>
<el-table-column prop="orderNo" align="center" label="订单号" > </el-table-column>
<el-table-column prop="payAmount" align="center" label="订单金额（元）"></el-table-column>
<el-table-column prop="payAmount" align="center" label="订单金额（万元）"></el-table-column>
<el-table-column prop="payChannel" align="center" label="订单类型">
<template slot-scope="scope">
<span v-if="scope.row.payChannel=='cashier'">收银台</span>
<span v-else-if="scope.row.payChannel=='POS'">POS机</span>
<span v-else-if="scope.row.payChannel=='PC'">收银台</span>
<span v-else-if="scope.row.payChannel=='PC'">平台</span>
<span v-else-if="scope.row.payChannel=='applet'">小程序</span>
<span v-else>其他</span>
</template>
@ -103,9 +103,9 @@
</el-table-column>
<el-table-column prop="status" align="center" label="支付状态">
<template slot-scope="scope">
<el-tag v-if="scope.row.status == 'unpaid'">待支付</el-tag>
<el-tag type="success" v-else-if="scope.row.status == 'paid'">支付成功</el-tag>
<el-tag type="danger" v-else-if="scope.row.status == 'refund'">退款成功</el-tag>
<el-tag v-if="scope.row.status == 'unpaid'">未支付</el-tag>
<el-tag type="success" v-else-if="scope.row.status == 'paid'">已支付</el-tag>
<el-tag type="danger" v-else-if="scope.row.status == 'refund'">已退款</el-tag>
<el-tag type="danger" v-else>支付失败</el-tag>
</template>
</el-table-column>

45
fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/vip.vue
View File

@ -1,6 +1,6 @@
<!-- 收银台订单-->
<template>
<div style="margin-top: 0px;margin-right: 40px">
<div style="margin-top: 0px">
<el-card class="box-card">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px">
<el-form-item label="" prop="deptId" style="width: 180px">
@ -45,11 +45,11 @@
<el-select
v-model="queryParams.status"
clearable
placeholder="订单状态"
placeholder="支付状态"
>
<el-option label="支付成功" value="paid"/>
<el-option label="待支付" value="unpaid"/>
<el-option label="退款失败" value="refund"/>
<el-option label="已支付" value="paid"/>
<el-option label="未支付" value="unpaid"/>
<el-option label="已退款" value="refund"/>
<el-option label="支付失败" value="payFail"/>
</el-select>
</el-form-item>
@ -72,7 +72,7 @@
<el-form-item class="" style="float: right;margin-right:0px">
<el-form-item class="" 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>
</el-form-item>
@ -83,15 +83,28 @@
<el-table
:data="orderList"
style="width: 100%">
"storeId": "",
"orderNo": "",
"payChannel": "",
"payAmount": "",
"payType": "",
"status": "",
"name": "",
"mobile": "",
"rechargeType": "",
"mchntCd": "",
"paymentChannel": "",
"createTime": "",
"payTime": ""
<el-table-column type="index" width="50" align="center" label="序号"/>
<el-table-column prop="storeName" align="center" label="机构名称"> </el-table-column>
<el-table-column prop="orderNo" align="center" label="订单号" > </el-table-column>
<el-table-column prop="payAmount" align="center" label="订单金额（元）"></el-table-column>
<el-table-column prop="payAmount" align="center" label="订单金额（万元）"></el-table-column>
<el-table-column prop="payChannel" align="center" label="订单类型">
<template slot-scope="scope">
<span v-if="scope.row.payChannel=='cashier'">收银台</span>
<span v-else-if="scope.row.payChannel=='POS'">POS机</span>
<span v-else-if="scope.row.payChannel=='PC'">收银台</span>
<span v-else-if="scope.row.payChannel=='PC'">平台</span>
<span v-else-if="scope.row.payChannel=='applet'">小程序</span>
<span v-else>其他</span>
</template>
@ -106,9 +119,9 @@
</el-table-column>
<el-table-column prop="status" align="center" label="支付状态">
<template slot-scope="scope">
<el-tag v-if="scope.row.status == 'unpaid'">待支付</el-tag>
<el-tag type="success" v-else-if="scope.row.status == 'paid'">支付成功</el-tag>
<el-tag type="danger" v-else-if="scope.row.status == 'refund'">退款成功</el-tag>
<el-tag v-if="scope.row.status == 'unpaid'">未支付</el-tag>
<el-tag type="success" v-else-if="scope.row.status == 'paid'">已支付</el-tag>
<el-tag type="danger" v-else-if="scope.row.status == 'refund'">已退款</el-tag>
<el-tag type="danger" v-else>支付失败</el-tag>
</template>
</el-table-column>
@ -123,16 +136,8 @@
</el-table-column>
</el-table-column>
<el-table-column prop="mchntCd" align="center" label="支付通道">
<template slot-scope="scope">
{{scope.row.mchntCd?scope.row.mchntCd:'--'}}
</template>
</el-table-column>
<el-table-column prop="paymentChannel" align="center" label="商户号编码" width="150">
<template slot-scope="scope">
{{scope.row.mchntCd?scope.row.paymentChannel:'--'}}
</template></el-table-column>
<el-table-column prop="paymentChannel" align="center" label="商户号编码" width="150"> </el-table-column>
<el-table-column prop="createTime" align="center" label="订单创建时间" > </el-table-column>
<el-table-column prop="payTime" align="center" label="订单完成时间" >
<template slot-scope="scope">

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

@ -61,11 +61,7 @@
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">
<template slot-scope="scope">
{{(scope.row.paidInfo/10000).toFixed(6)}}
</template>
</el-table-column>
<el-table-column prop="paidInfo" label="累计交易金额 (万元)" width="150" align="center"></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>
@ -76,11 +72,7 @@
<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>
<el-table-column prop="statDate" label="统计日期" align="center">
<template>
{{this.value2[0]}} 至{{this.value2[1]}}
</template>
</el-table-column>
<el-table-column prop="statDate" label="统计日期" width="200" align="center"></el-table-column>
</el-table>
</div>

35
fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/oil.vue
View File

@ -73,53 +73,32 @@
style="width: 100%">
<el-table-column type="index" width="50" align="center" label="序号"/>
<el-table-column align="center" prop="storeName" label="机构名称"></el-table-column>
<el-table-column align="center" prop="payAmount" label="累计交易金额(万元)">
<template slot-scope="scope">
{{(scope.row.payAmount/10000).toFixed(6)}}
</template>
</el-table-column>
<el-table-column align="center" prop="payAmount" label="累计交易金额(万元)"></el-table-column>
<el-table-column align="center" prop="sum" label="累计交易笔数"></el-table-column>
<el-table-column align="center" prop="oilNum" label="累计交易升数"></el-table-column>
<el-table-column align="center" label="92#汽油">
<el-table-column align="center" prop="amount92" label="交易金额(万元)">
<template slot-scope="scope">
{{(scope.row.amount92/10000).toFixed(6)}}
</template>
</el-table-column>
<el-table-column align="center" prop="amount92" label="交易金额(万元)"></el-table-column>
<el-table-column align="center" prop="count92" label="交易笔数"></el-table-column>
<el-table-column align="center" prop="num92" label="交易升数"></el-table-column>
</el-table-column>
<el-table-column align="center" label="95#汽油">
<el-table-column align="center" prop="amount95" label="交易金额(万元)">
<template slot-scope="scope">
{{(scope.row.amount95/10000).toFixed(6)}}
</template>
</el-table-column>
<el-table-column align="center" prop="amount95" label="交易金额(万元)"></el-table-column>
<el-table-column align="center" prop="count95" label="交易笔数"></el-table-column>
<el-table-column align="center" prop="num95" label="交易升数"></el-table-column>
<el-table-column prop="num95" label="交易升数"></el-table-column>
</el-table-column>
<el-table-column align="center" label="98#汽油">
<el-table-column align="center" prop="amount98" label="交易金额(万元)">
<template slot-scope="scope">
{{(scope.row.amount98/10000).toFixed(6)}}
</template>
</el-table-column>
<el-table-column align="center" prop="amount98" label="交易金额(万元)"></el-table-column>
<el-table-column align="center" prop="count98" label="交易笔数" ></el-table-column>
<el-table-column align="center" prop="num98" label="交易升数" ></el-table-column>
</el-table-column>
<el-table-column align="center" label="0#柴油">
<el-table-column align="center" prop="amount0" label="交易金额(万元)" >
<template slot-scope="scope">
{{(scope.row.amount0/10000).toFixed(6)}}
</template>
</el-table-column>
<el-table-column align="center" prop="amount0" label="交易金额(万元)" ></el-table-column>
<el-table-column align="center" prop="count0" label="交易笔数" ></el-table-column>
<el-table-column align="center" prop="num0" label="交易升数" ></el-table-column>
</el-table-column>
<el-table-column align="center" prop="date" label="统计日期" >
<template>
{{this.value2[0]}} 至{{this.value2[1]}}
<!-- this.value2 = [parseTime(start1),parseTime(new Date())];-->
<!-- {{this.beginTime}} -{{this.endTime}}-->
</template>
</el-table-column>
</el-table>

18
fuintAdmin_zt/src/views/financialStatement/yunyingfenxi/tab/store.vue
View File

@ -62,21 +62,13 @@
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="payAmounts" label="累计交易金额 (万元)" align="center">
<template slot-scope="scope">
{{(scope.row.payAmounts/10000).toFixed(6)}}
</template>
</el-table-column>
<el-table-column prop="payAmounts" label="累计交易金额 (万元)" align="center"></el-table-column>
<el-table-column prop="counts" label="累计交易笔数" align="center"></el-table-column>
<el-table-column prop="goodsNums" label="累计销售商品数量" align="center"></el-table-column>
<el-table-column label="商品信息" align="center">
<el-table-column prop="cvgNum" label="品类数量" width="100" align="center"></el-table-column>
<el-table-column prop="goodsNum" label="商品数量" width="100" align="center"></el-table-column>
<el-table-column prop="payAmounts" label="累计交易金额 (万元)" width="150" align="center">
<template slot-scope="scope">
{{(scope.row.payAmounts/10000).toFixed(6)}}
</template>
</el-table-column>
<el-table-column prop="payAmounts" label="累计交易金额 (万元)" width="150" align="center"></el-table-column>
</el-table-column>
<el-table-column label="热销品类信息" align="center">
@ -92,11 +84,7 @@
<el-table-column prop="goodsAmount" label="销售金额 (元)" width="150" align="center"></el-table-column>
<!-- <el-table-column prop="supplierName" label="供应商名称" width="100" align="center"></el-table-column>-->
</el-table-column>
<el-table-column prop="statDate" label="统计日期" width="200" align="center">
<template>
{{this.value2[0]}} 至{{this.value2[1]}}
</template>
</el-table-column>
<el-table-column prop="statDate" label="统计日期" width="200" align="center"></el-table-column>
</el-table>
</div>

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

@ -1,6 +1,6 @@
<!-- 收银台订单-->
<template>
<div style="margin-top: 0px;margin-right: 40px">
<div style="margin-top: 0px;margin-right: 20px">
<el-card class="box-card">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px">
<el-form-item label="" prop="deptId" style="width: 180px">
@ -57,7 +57,6 @@
<div class="table-box">
<el-table
:data="orderList"
border
style="width: 100%">
<el-table-column type="index" width="50" align="center" label="序号"/>
<el-table-column prop="userName" align="center" label="会员名称"> </el-table-column>
@ -65,8 +64,8 @@
<el-table-column prop="physicalCard" align="center" label="会员卡号"></el-table-column>
<el-table-column prop="storeName" align="center" label="所属机构"> </el-table-column>
<el-table-column prop="gradeName" align="center" label="会员等级" > </el-table-column>
<el-table-column prop="amount" align="center" label="累计充值金额（元）" > </el-table-column>
<el-table-column prop="countNum" align="center" label="累计充值次数" > </el-table-column>
<el-table-column prop="consumeNum" align="center" label="累计充值金额（元）" > </el-table-column>
<el-table-column prop="amount" align="center" label="累计充值次数" > </el-table-column>
<el-table-column prop="leijiMoney" align="center" label="累计消费金额（元）" > </el-table-column>
<el-table-column prop="leijiNum" align="center" label="累计消费笔数" > </el-table-column>
<!-- <el-table-column prop="createTime" align="center" label="囤油卡余额" > </el-table-column>-->
@ -165,10 +164,10 @@ import {getFenXiUserbalanceDataApi, getFenXiUserbalanceListApi} from "@/api/fina
},
exportExcelCashier() {
let dateRange = []
// if (this.beginTime && this.endTime) {
// dateRange.push(this.beginTime.toLocaleDateString())
// dateRange.push(this.endTime.toLocaleDateString())
// }
if (this.beginTime && this.endTime) {
dateRange.push(this.beginTime.toLocaleDateString())
dateRange.push(this.endTime.toLocaleDateString())
}
exportExcelTradingApi(this.addDateRange(this.queryParams, dateRange)).then(res=>{
const blob = new Blob([res], { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' });
this.$download.saveAs(blob,'交易明细统计.xLsx')
@ -178,10 +177,10 @@ import {getFenXiUserbalanceDataApi, getFenXiUserbalanceListApi} from "@/api/fina
getOrderStatistics() {
let dateRange = []
// if (this.beginTime && this.endTime) {
// dateRange.push(this.beginTime.toLocaleDateString())
// dateRange.push(this.endTime.toLocaleDateString())
// }
if (this.beginTime && this.endTime) {
dateRange.push(this.beginTime.toLocaleDateString())
dateRange.push(this.endTime.toLocaleDateString())
}
getFenXiUserbalanceDataApi(this.addDateRange(this.queryParams, dateRange)).then(res=>{
this.orderStatistics = res.data
console.log("res.data1111",res.data)
@ -191,10 +190,10 @@ import {getFenXiUserbalanceDataApi, getFenXiUserbalanceListApi} from "@/api/fina
// 获取列表信息
getList(val){
let dateRange = []
// if (this.beginTime && this.endTime) {
// dateRange.push(this.beginTime.toLocaleDateString())
// dateRange.push(this.endTime.toLocaleDateString())
// }
if (this.beginTime && this.endTime) {
dateRange.push(this.beginTime.toLocaleDateString())
dateRange.push(this.endTime.toLocaleDateString())
}
getFenXiUserbalanceListApi(this.addDateRange(this.queryParams,dateRange)).then( response => {
this.orderList = response.data.records;
this.total = response.data.total;

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

@ -114,15 +114,13 @@
</div>
</div>
<div class="hui-hang"></div>
<div class="d-s" >
<div>
<div class="h-tt" >活跃油站</div>
<div id="ccc" style="width: 300px;height: 200px; "></div>
</div>
<div id="cccc" style="width: 300px;height: 200px;"></div>
<div id="ccct" style="width: 300px;height: 200px;"></div>
<div id="cttt" style="width: 340px;height: 200px;"></div>
<div class="h-tt" >活跃油站</div>
<div class="d-s" style="justify-content: space-around" >
<div id="ccc" style="width: 750px;height: 600px;"></div>
<div>
<div id="cttt" style="width: 350px;height: 300px;"></div>
<div id="ccct" style="width: 350px;height: 300px;"></div>
</div>
</div>
</div>
<div class="right-box-t">
@ -155,6 +153,7 @@
</el-date-picker>
</div>
<div id="ctct" style="width: 100%; height: 315px;background: linear-gradient( 360deg, #F8F0E7 0%, #FFFFFF 100%); "></div>
<div id="cccc" style="width: 300px;height: 200px;"></div>
</div>
@ -328,7 +327,6 @@ export default {
const chart2= echarts.init(document.getElementById('ccct'))
const chart4= echarts.init(document.getElementById('cttt'))
const chart3= echarts.init(document.getElementById('ctct'))
let hourList = []
let storeNumList = []
let tradeAmountList = []
@ -359,37 +357,71 @@ export default {
tradeNumList = [0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0]
}
const option = {
const option = {
color: [
'#3B6ADE',
'#409eff',
'#179726',
'#FFB519',
],
tooltip: {
trigger: 'item'
trigger: 'item',
formatter: '{a} <br/>{b}: {c} ({d}%)'
},
legend: {
top: '0%',
left: 'center'
},
series: [
{
name: 'Access From',
name: '',
type: 'pie',
radius: '80%',
selectedMode: 'single',
radius: [0, '35%'],
label: {
position: 'inner',
fontSize: 14,
formatter: '{d}%'
},
labelLine: {
show: false
},
data: [
// { value: 28, name: '28%' },
// { value: 72, name: '72%' },
// { value: this.countPercentage(Number(this.storeAmount.noStoreTotal),Number(this.storeAmount.noStoreTotal) + Number(this.storeAmount.storeTotal)), name: '非7日活跃油站' },
// { value: this.countPercentage(Number(this.storeAmount.storeTotal),Number(this.storeAmount.noStoreTotal) + Number(this.storeAmount.storeTotal)), name: '7日活跃油站' },
{ value: Number(this.storeAmount.noStoreTotal), name: '非7日活跃油站' },
{ value: Number(this.storeAmount.storeTotal), name: '7日活跃油站' },
],
emphasis: {
itemStyle: {
shadowBlur: 10,
shadowOffsetX: 0,
shadowColor: 'rgba(0, 0, 0, 0.5)'
{ value: 1548, name: '非七日活跃' },
{ value: 775, name: '七日活跃' }
]
},
{
name: '',
type: 'pie',
radius: ['45%', '68%'],
labelLine: {
length: 30
},
label: {
formatter: '{a|{a}}{abg|}\n{hr|}\n {b|{b}：}{c} {per|{d}%} ',
rich: {
b: {
color: '#4C5058',
fontSize: 14,
fontWeight: 'bold',
lineHeight: 14
},
per: {
color: '#fff',
backgroundColor: '#4C5058',
padding: [3, 4],
borderRadius: 4
}
}
}
},
data: [
{ value: 1048, name: '本月新增' },
{ value: 335, name: '非本月新增' }
]
}
]
};
@ -428,35 +460,39 @@ export default {
]
};
const option2 = {
color: [
'#0DC291',
'#FFB519',
],
color: ['#fe7e01', '#48c837'],
tooltip: {
trigger: 'item'
trigger: 'item',
formatter: '{d}%'
},
legend: {
bottom: '0%',
left: 'center'
},
series: [
{
name: 'Access From',
name: '',
type: 'pie',
radius: '80%',
data: [
// { value: 28, name: '28%' },
// { value: 72, name: '72%' },
// { value: this.countPercentage(Number(this.storeAmount.weekStoreTotal),Number(this.storeAmount.weekStoreTotal) + Number(this.storeAmount.noWeekStoreTotal)), name: '本月新增7日活跃油站' },
// { value: this.countPercentage(Number(this.storeAmount.noWeekStoreTotal),Number(this.storeAmount.weekStoreTotal) + Number(this.storeAmount.noWeekStoreTotal)), name: '本月新增非7日活跃油站' },
{ value: Number(this.storeAmount.weekStoreTotal), name: '本月新增7日活跃油站' },
{ value: Number(this.storeAmount.noWeekStoreTotal), name: '本月新增非7日活跃油站' },
radius: ['40%', '80%'],
avoidLabelOverlap: false,
itemStyle: {
borderRadius: 10,
borderColor: '#fff',
borderWidth: 10
},
data: [
{ value: 50, name: '富友交易金额占比 ' },
{ value: 50, name: '拉卡拉交易金额占比' }
// { value: this.countPercentage(Number(this.storeAmount.fuYouAmount),Number(this.storeAmount.fuYouAmount) + Number(this.storeAmount.laKaLaAmount)), name: '富友占比' },
// { value: this.countPercentage(Number(this.storeAmount.laKaLaAmount),Number(this.storeAmount.fuYouAmount) + Number(this.storeAmount.laKaLaAmount)), name: '拉卡拉占比' }
],
emphasis: {
itemStyle: {
shadowBlur: 10,
shadowOffsetX: 0,
shadowColor: 'rgba(0, 0, 0, 0.5)'
}
}
label: {
show: true,
position: "inside",
color:'#fff',
formatter: `{d}%`,
},
}
]
};
@ -564,16 +600,20 @@ export default {
};
const option4 ={
color: ['#f82f2f', '#179627'],
color: ['#fe7e01', '#48c837'],
tooltip: {
trigger: 'item'
trigger: 'item',
formatter: '{d}%'
},
legend: {
bottom: '0%',
left: 'center'
},
series: [
{
name: 'Access From',
name: '',
type: 'pie',
radius: ['40%', '70%'],
radius: ['40%', '80%'],
avoidLabelOverlap: false,
itemStyle: {
borderRadius: 10,
@ -581,20 +621,18 @@ export default {
borderWidth: 10
},
emphasis: {
label: {
show: true,
fontSize: 40,
fontWeight: 'bold'
}
},
data: [
// { value: 225, name: '富友占比' },
// { value: 735, name: '拉卡拉占比' }
{ value: this.countPercentage(Number(this.storeAmount.fuYouAmount),Number(this.storeAmount.fuYouAmount) + Number(this.storeAmount.laKaLaAmount)), name: '富友占比' },
{ value: this.countPercentage(Number(this.storeAmount.laKaLaAmount),Number(this.storeAmount.fuYouAmount) + Number(this.storeAmount.laKaLaAmount)), name: '拉卡拉占比' }
]
{ value: 50, name: '富友交易金额占比 ' },
{ value: 50, name: '拉卡拉交易金额占比' }
// { value: this.countPercentage(Number(this.storeAmount.fuYouAmount),Number(this.storeAmount.fuYouAmount) + Number(this.storeAmount.laKaLaAmount)), name: '富友占比' },
// { value: this.countPercentage(Number(this.storeAmount.laKaLaAmount),Number(this.storeAmount.fuYouAmount) + Number(this.storeAmount.laKaLaAmount)), name: '拉卡拉占比' }
],
label: {
show: true,
position: "inside",
color:'#fff',
formatter: `{d}%`,
},
}
]
};
@ -639,7 +677,7 @@ export default {
.b-bs{
width: 100%;
display: flex;
align-items: center;
justify-content: space-between;
margin-top: 20px;
}
@ -662,11 +700,11 @@ export default {
border-radius: 8px;
background: #fff;
border: 1px solid #FFFFFF;
height: 380px;
}
.right-box{
width: 25%;
width: 26%;
border-radius: 8px;
background: #fff;
border: 1px solid #FFFFFF;
@ -675,11 +713,11 @@ export default {
padding: 15px;
}
.right-box-t{
width: 25%;
width: 26%;
border-radius: 8px;
background: #fff;
border: 1px solid #FFFFFF;
height: 380px;
height: 100%;
box-sizing: border-box;
padding: 15px;
}

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

@ -2,19 +2,15 @@
<div class="app-container">
<el-card >
<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 label="" prop="orgName">
<el-input
v-model="queryParams.orgName"
placeholder="请输入机构名称"
clearable
style="width: 240px;"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="" prop="legalRepresentativeContact">
<el-input
v-model="queryParams.legalRepresentativeContact"
@ -24,14 +20,11 @@
@keyup.enter.native="handleQuery"
/>
</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>
</el-select>
</el-form-item>
<el-form-item style="float: right;margin-right: 0px">
<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>
<el-button
@ -41,11 +34,11 @@
>新增小程序配置</el-button>
</el-form-item>
</el-form>
<!-- </el-card>-->
</el-card>
<!-- &lt;!&ndash; 列表信息&ndash;&gt;-->
<!-- <el-card style="margin-top: 20px" >-->
<el-table :data="tableData" style="width: 100%" border>
<!-- 列表信息-->
<el-card style="margin-top: 20px" >
<el-table :data="tableData" style="width: 100%">
<el-table-column type="index" label="序号"></el-table-column>
<el-table-column prop="orgName" label="机构名称"></el-table-column>
<el-table-column prop="unifiedSocialCreditCode" label="统一社会信用代码"></el-table-column>
@ -95,46 +88,36 @@
</el-card>
<el-dialog :title="title" :close-on-click-modal="false" :visible.sync="open" width="30%" 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-dialog :title="title" :close-on-click-modal="false" :visible.sync="open" width="50%" append-to-body>
<el-form ref="form" :model="deviceInfo" label-width="80px">
<el-form :model="deviceInfo" ref="deviceForm" label-width="120px">
<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">
<el-select
v-model="deviceInfo.orgId"
clearable
placeholder="机构名称"
style="width: 300px;"
>
<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">
<el-input v-model="deviceInfo.unifiedSocialCreditCode" style="width: 300px;"></el-input>
<el-input v-model="deviceInfo.unifiedSocialCreditCode"></el-input>
</el-form-item>
<el-form-item label="小程序appID" prop="appId">
<el-input v-model="deviceInfo.appId" style="width: 300px;"></el-input>
<el-input v-model="deviceInfo.appId"></el-input>
</el-form-item>
<el-form-item label="密钥" prop="appKey">
<el-input v-model="deviceInfo.appKey" style="width: 300px;"></el-input>
<el-input v-model="deviceInfo.appKey"></el-input>
</el-form-item>
<el-form-item label="法人姓名" prop="legalRepresentativeName">
<el-input v-model="deviceInfo.legalRepresentativeName" style="width: 300px;"></el-input>
<el-input v-model="deviceInfo.legalRepresentativeName"></el-input>
</el-form-item>
<el-form-item label="法人微信号" prop="legalRepresentativeWechat">
<el-input v-model="deviceInfo.legalRepresentativeWechat" style="width: 300px;"></el-input>
<el-input v-model="deviceInfo.legalRepresentativeWechat"></el-input>
</el-form-item>
<el-form-item label="法人联系方式" prop="legalRepresentativeContact">
<el-input v-model="deviceInfo.legalRepresentativeContact" style="width: 300px;"></el-input>
<el-input v-model="deviceInfo.legalRepresentativeContact"></el-input>
</el-form-item>
<el-form-item label="小程序状态" prop="appStatus">
<el-switch
@ -147,7 +130,7 @@
<el-button type="primary" @click="submitForm('deviceForm')">提交</el-button>
</el-form-item>
</el-form>
<!-- </el-form>-->
</el-form>
</el-dialog>
</div>
@ -158,7 +141,6 @@
import {deleteAppApi, getAppListApi, saveAppApi, updateAppApi} from "@/api/sys/app";
import {updateBannerApi} from "@/api/sys/banner";
import {getRunningWaterByTissueApi} from "@/api/allOrder";
export default {
name: "printIndex",
@ -166,12 +148,9 @@ export default {
data() {
return {
tableData: [],
deptList: [],
deviceInfo: {
id: null, // 自增id
orgName: '', // 机构名称
orgId: '', // 机构名称
unifiedSocialCreditCode: '', // 统一社会信用代码
appId: '', // 小程序appID
appKey: '', // 密钥
@ -181,15 +160,6 @@ export default {
appStatus: false, // 小程序状态
createByName: '',
},
rule: {
orgId: [{required: true, message: '请选择机构名称', trigger: 'blur'},],
unifiedSocialCreditCode: [{required: true, message: '请填写统一社会信用代码', trigger: 'blur'},],
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'},],
legalRepresentativeContact: [{required: true, message: '请填写法人联系方式', trigger: 'blur'},],
},
// 是否显示弹出层
open: false,
title:"",
@ -199,7 +169,6 @@ export default {
page: 1,
pageSize: 10,
orgName:'',
orgId:'',
legalRepresentativeContact:'',
appStatus:'',
},
@ -207,14 +176,8 @@ export default {
},
created() {
this.getList()
this.getDeptList()
},
methods: {
getDeptList() {
getRunningWaterByTissueApi(this.addDateRange(this.queryParams)).then(response => {
this.deptList = response.data.records;
})
},
getList(){
getAppListApi(this.queryParams).then(res=>{
this.tableData = res.data.records;
@ -237,11 +200,7 @@ export default {
},
submitDeviceInfo() {
// 在这里调用接口提交设备信息数据
let filter = this.deptList.filter(item => item.deptId == this.deviceInfo.orgId);
this.deviceInfo.orgName = filter[0].deptName
console.log('提交设备信息数据:', this.deviceInfo);
if (this.deviceInfo.id) {
updateAppApi(this.deviceInfo).then(res=>{
if(res.code === 200) {
@ -286,12 +245,12 @@ export default {
handleAdd(e) {
this.clean()
this.open = true;
this.title = "新增小程序配置"
this.title = "增加设备"
},
edit(e) {
this.clean()
this.open = true;
this.title = "编辑小程序配置"
this.title = "编辑设备"
this.deviceInfo = e
console.log('提交设备信息数据:', this.deviceInfo);

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

@ -37,7 +37,7 @@
</el-select>
</el-form-item>
<el-form-item style="float: right ;margin-right: 0px">
<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>
<el-button
@ -54,7 +54,7 @@
<!-- <el-card style="margin-top: 20px" >-->
<el-table :data="tableData" style="width: 100%" border>
<el-table :data="tableData" style="width: 100%">
<el-table-column type="index" label="序号"></el-table-column>
<el-table-column prop="bannerName" label="banner名称"></el-table-column>
<el-table-column prop="productImage" label="图片">

4
fuintAdmin_zt/src/views/setting/hardware.vue
View File

@ -34,7 +34,7 @@
</el-select>
</el-form-item>
<el-form-item style="float: right;margin-right: 0px">
<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>
<el-button
@ -46,7 +46,7 @@
</el-form-item>
</el-form>
<el-table :data="tableData" style="width: 100%" border>
<el-table :data="tableData" style="width: 100%">
<el-table-column type="index" label="序号"></el-table-column>
<el-table-column prop="name" label="商品名称"></el-table-column>
<el-table-column prop="categoryName" label="商品分类"></el-table-column>

12
fuintAdmin_zt/src/views/setting/sysLog.vue
View File

@ -1,6 +1,7 @@
<template>
<div class="app-container" style="padding: 0px">
<!--<<<<<<< HEAD-->
<div class="tab-box">
<div class="f-box" v-for="(item,index) in tablist" :key="index" @click="activeindex=index,handleClick2()" :class="{ 'active' :activeindex==index}">{{item.name}}</div>
</div>
@ -19,6 +20,13 @@
<!--=======-->
<!-- <el-card >-->
<!-- <el-tabs v-model="activeName" @tab-click="handleClick">-->
<!-- <el-tab-pane label="中台系统" name="first"></el-tab-pane>-->
<!-- <el-tab-pane label="油站系统" name="second"></el-tab-pane>-->
<!-- </el-tabs>-->
<!--&gt;>>>>>> d25f5b521c8a75cc04591397604acc7d4a5eb604-->
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="90px">
<el-form-item label="" prop="createName">
<el-input
@ -83,7 +91,7 @@
</el-form-item>
</el-form>
<el-table :data="tableData" style="width: 100%" border>
<el-table :data="tableData" style="width: 100%">
<el-table-column type="index" label="序号"></el-table-column>
<el-table-column prop="createAccount" label="登录账号"></el-table-column>
<el-table-column prop="createName" label="操作用户"></el-table-column>
@ -99,7 +107,7 @@
</template>
</el-table-column>
<el-table-column prop="moudle" label="操作模块"></el-table-column>
<el-table-column prop="content" label="操作内容" width="500"></el-table-column>
<el-table-column prop="content" label="操作内容"></el-table-column>
<el-table-column prop="ipAddr" label="IP地址"></el-table-column>
<el-table-column prop="createTime" label="操作时间"></el-table-column>
</el-table>

7
fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/PaymentRuleConfigServiceImpl.java
View File

@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.fuint.api.fuyou.entity.OilConfig;
import com.fuint.api.fuyou.entity.PaymentRuleConfig;
import com.fuint.api.fuyou.mapper.PaymentRuleConfigMapper;
import com.fuint.api.fuyou.service.MerchantConfigService;
import com.fuint.api.fuyou.service.OilConfigService;
import com.fuint.api.fuyou.service.PaymentRuleConfigService;
import com.fuint.api.fuyou.vo.OilConfigVo;
@ -24,6 +25,8 @@ public class PaymentRuleConfigServiceImpl extends ServiceImpl<PaymentRuleConfigM
@Autowired
private OilConfigService oilConfigService;
@Autowired
private MerchantConfigService merchantConfigService;
@Override
public List<PaymentRuleConfigVo> selectList(PaymentRuleConfig paymentRuleConfig) {
@ -106,6 +109,10 @@ public class PaymentRuleConfigServiceImpl extends ServiceImpl<PaymentRuleConfigM
baseMapper.updateById(paymentRuleConfig);
}
int i = 1;
if (ruleConfig.getStatus().equals("jy")){
// 将其他使用的账户关掉
merchantConfigService.updateMerchOrter(ruleConfig.getStoreId());
}
if (ruleConfig.getStatus().equals("qy") && ruleConfig.getRuleType().equals("1")){
i = oilConfigService.judgmentProportion1(ruleConfig.getStoreId(), ruleConfig.getId());
}

3
fuintBackend/fuint-application/src/main/java/com/fuint/business/member/entity/LJStaff.java
View File

@ -131,4 +131,7 @@ public class LJStaff extends BaseEntity implements Serializable {
//码牌绑定状态 0：未绑定 1：已绑定
@TableField(exist = false)
private String tagStatus;
// 登录账号
@TableField(exist = false)
private String accountName;
}

1
fuintBackend/fuint-application/src/main/java/com/fuint/business/member/mapper/LJStaffMapper.java
View File

@ -41,4 +41,5 @@ public interface LJStaffMapper extends BaseMapper<LJStaff> {
List<Map<String,String>> employeeSales(@Param("storeId") Integer storeId);
List<Map<String,String>> employeeSalesMongth(@Param("storeId") Integer storeId);
LJStaff selectStaffById(@Param("id") Integer id);
}

8
fuintBackend/fuint-application/src/main/java/com/fuint/business/member/mapper/xml/LJStaffMapper.xml
View File

@ -6,8 +6,9 @@
</sql>
<!--根据条件分页查询用户信息-->
<select id="selectLJStaffList" resultType="com.fuint.business.member.entity.LJStaff">
SELECT ms.*,td.duty_name FROM mt_staff ms
SELECT ms.*,td.duty_name,ta.account_name FROM mt_staff ms
left join t_duty td on ms.role_id = td.duty_id
LEFT JOIN t_account ta on ms.id = ta.staff_id
<where>
ms.store_id = #{staff.storeId} and ms.if_delete = 0
<if test="staff.realName != null and staff.realName != ''">
@ -104,4 +105,9 @@
ORDER BY
totalSum DESC
</select>
<select id="selectStaffById" resultType="com.fuint.business.member.entity.LJStaff">
SELECT ms.*,ta.account_name FROM mt_staff ms
LEFT JOIN t_account ta on ms.id = ta.staff_id
where ms.id = #{id}
</select>
</mapper>

2
fuintBackend/fuint-application/src/main/java/com/fuint/business/member/service/ILJStaffService.java
View File

@ -47,7 +47,7 @@ public interface ILJStaffService extends IService<LJStaff> {
* @param id
* @return
*/
public LJStaff selectStaffById(int id);
public LJStaff selectStaffById(Integer id);
/**
* 根据手机号查询员工信息

17
fuintBackend/fuint-application/src/main/java/com/fuint/business/member/service/impl/LJStaffServiceImpl.java
View File

@ -142,11 +142,12 @@ public class LJStaffServiceImpl extends ServiceImpl<LJStaffMapper, LJStaff> impl
* @return
*/
@Override
public LJStaff selectStaffById(int id) {
QueryWrapper queryWrapper = new QueryWrapper<>();
queryWrapper.eq("id",id);
queryWrapper.eq("if_delete","0");
return baseMapper.selectOne(queryWrapper);
public LJStaff selectStaffById(Integer id) {
// QueryWrapper queryWrapper = new QueryWrapper<>();
// queryWrapper.eq("id",id);
// queryWrapper.eq("if_delete","0");
// return baseMapper.selectOne(queryWrapper);
return baseMapper.selectStaffById(id);
}
/**
@ -234,7 +235,11 @@ public class LJStaffServiceImpl extends ServiceImpl<LJStaffMapper, LJStaff> impl
String timestamp = dateFormat.format(new Date());
String randomString = UUID.randomUUID().toString().replace("-","").substring(0,6);
account.setAccountKey(timestamp+randomString);
account.setAccountName(staff.getMobile());
if (ObjectUtil.isNotEmpty(staff.getAccountName())){
account.setAccountName(staff.getAccountName());
}else {
account.setAccountName(staff.getMobile());
}
account.setAccountStatus(1);
account.setRealName(staff.getRealName());
account.setRoleIds(staff.getRoleId());

1
fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/AllOrderInfoMapper.xml
View File

@ -178,6 +178,7 @@
aoi.update_time AS updateTime,
aoi.update_by AS updateBy,
aoi.content AS content,
aoi.status AS status,
mu.name userName,
mu.mobile userMobile
from all_order_info aoi

4
fuintBackend/fuint-application/src/main/java/com/fuint/business/store/controller/BackendStoreController.java
View File

@ -375,4 +375,8 @@ public class BackendStoreController extends BaseController {
return getSuccessResult(storeService.getStoreAmountByTime(store));
}
@GetMapping("/getStoreByDeptId/{deptId}")
public ResponseObject getStoreByDeptId(@PathVariable Integer deptId){
return getSuccessResult(storeService.getStoreByDeptId(deptId));
}
}

2
fuintBackend/fuint-application/src/main/java/com/fuint/business/store/service/StoreService.java
View File

@ -137,4 +137,6 @@ public interface StoreService extends IService<MtStore> {
* @return
*/
List<StoreNumVo> getStoreAmountByTime(MtStore store);
List<MtStore> getStoreByDeptId(Integer deptId);
}

8
fuintBackend/fuint-application/src/main/java/com/fuint/business/store/service/impl/StoreServiceImpl.java
View File

@ -754,6 +754,14 @@ public class StoreServiceImpl extends ServiceImpl<MtStoreMapper, MtStore> implem
return baseMapper.selectStoreNum(store,storeIds);
}
@Override
public List<MtStore> getStoreByDeptId(Integer deptId) {
QueryWrapper queryWrapper = new QueryWrapper<>();
queryWrapper.eq("if_delete","0");
queryWrapper.eq("contract_dept_id",deptId);
return baseMapper.selectList(queryWrapper);
}
// 将在部门里面删除的在油站中删除
public void beachDelStore() {
LambdaQueryWrapper<SysDept> lambdaQueryWrapper = new LambdaQueryWrapper();

2
fuintBackend/fuint-application/src/main/java/com/fuint/business/storeInformation/service/impl/LJStoreServiceImpl.java
View File

@ -339,7 +339,7 @@ public class LJStoreServiceImpl extends ServiceImpl<LJStoreMapper, LJStore> impl
LocalDate currentDate = LocalDate.now();
long daysBetween = ChronoUnit.DAYS.between(givenDate, currentDate);
record.setRemind("以免费使用系统"+daysBetween+"天");
record.setRemind("已免费使用系统"+daysBetween+"天");
} else if (ObjectUtil.isNotEmpty(record.getTurnoverType()) && record.getTurnoverType().equals("2")) {
// 时间限制
LocalDate givenDate = record.getTurnoverEndTime().toInstant()

4
fuintBackend/fuint-application/src/main/resources/application.properties
View File

@ -9,6 +9,7 @@ env.profile=dev
#env.properties.path=D:/oil/new-oil/oilSystem/fuintBackend/configure/
env.properties.path=D:/code/oilSystem/fuintBackend/configure/
#env.properties.path=/www/wwwroot/shenlanshuke/oilAdmin/
# \u6570\u636E\u5E93\u914D\u7F6E
@ -59,9 +60,6 @@ rocketmq.producer.sendMsgTimeout=3000
#?????????????2
rocketmq.producer.retryTimesWhenSendFailed=2
# ?????
rocketmq.consumer.group=anran-consumer-group
rocketmq.consumer.topic=anran-topic

6
fuintCashierWeb/.env.development
View File

@ -11,8 +11,4 @@ VUE_APP_BASE_API = '/dev-api'
VUE_APP_PUBLIC_PATH = '/'
# 后端接口地址
#VUE_APP_SERVER_URL = 'http://192.168.31.96:8080/'
#VUE_APP_SERVER_URL = 'http://192.168.31.178:8081'
#VUE_APP_SERVER_URL = 'http://192.168.31.55:8081/'
VUE_APP_SERVER_URL = 'http://localhost:8081/'
VUE_APP_SERVER_URL = 'http://192.168.31.72:8081/'