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

bug

Browse Source
This commit is contained in:
cun-nan 2024-01-31 17:05:12 +08:00
parent 788fba4dae
commit 8a943fdb10
29 changed files with 297 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
fuintAdmin/src/api/feedback/feedBack.js Normal file
View File

@ -0,0 +1,10 @@
import request from '@/utils/request'
// 查询挂账信息列表
export function listFeekBack(query) {
return request({
url: '/business/userManager/feedback/list',
method: 'get',
params: query
})
}

8
fuintAdmin/src/views/convenienceStore/goodsFile.vue
View File

@ -90,7 +90,7 @@
<!--
@selection-change="handleSelectionChange" :default-sort="defaultSort"
@sort-change="handleSortChange"-->
<el-table-column label="ID" prop="id" align="center" width="60"/>
<el-table-column type="index" width="80" align="center" label="序号"/>
<el-table-column label="分类名称" prop="cvsGoodId" align="center" width="100">
<template slot-scope="scope">
<span>{{ getName(cvsGoodList, scope.row.cvsGoodId) }}</span>
@ -625,10 +625,10 @@ export default {
name = "确定要将此商品从回收站移至商品档案里吗?移出后将可售卖当前商品！"
prompt = "商品已移至商品档案,收银台商品信息页面刷新后实时生效！"
}
this.$modal.confirm(name).then(function() {
this.$modal.confirm(name).then(function () {
form.isRecovery = recovery;
updateLJGoods(form).then(response => {
this.getList();
return updateLJGoods(form).then(response => {
// this.getList();
});
}).then(() => {
this.getList();

2
fuintAdmin/src/views/convenienceStore/index.vue
View File

@ -40,7 +40,7 @@
:tree-props="{children: 'children', hasChildren: 'hasChildren'}"
@selection-change="handleSelectionChange" :default-sort="defaultSort"
@sort-change="handleSortChange">
<el-table-column label="ID" prop="id" align="center" width="60"/>
<el-table-column type="index" width="80" align="center" label="序号"/>
<el-table-column label="分类名称" align="center" prop="name"/>
<el-table-column label="商品编号" align="center" prop="code"/>
<el-table-column label="排序" align="center" prop="sorted" />

6
fuintAdmin/src/views/convenienceStore/saleStatistic.vue
View File

@ -60,9 +60,9 @@
<el-table ref="tables" v-loading="loading" :data="list"
@selection-change="handleSelectionChange" :default-sort="defaultSort"
@sort-change="handleSortChange">
<el-table-column label="ID" align="center" prop="id" width="40"/>
<el-table-column label="商品名称" align="center" prop="name" width="300" />
<el-table-column label="条码" align="center" prop="goodsNo" width="160" />
<el-table-column type="index" width="80" align="center" label="序号"/>
<el-table-column label="商品名称" align="center" prop="name" width="160" />
<el-table-column label="条码" align="center" prop="goodsNo" width="300" />
<el-table-column label="拼音码" align="center" prop="pinyinCode" />
<el-table-column label="单位" align="center" prop="unit" />
<el-table-column label="销售数量" align="center" prop="saleNumber" />

2
fuintAdmin/src/views/convenienceStore/stockStatistic.vue
View File

@ -95,7 +95,7 @@
<el-table ref="tables" v-loading="loading" :data="list"
@selection-change="handleSelectionChange" :default-sort="defaultSort"
@sort-change="handleSortChange">
<el-table-column label="ID" align="center" prop="id"/>
<el-table-column type="index" width="80" align="center" label="序号"/>
<el-table-column label="供应商" align="center" prop="supplierId">
<template slot-scope="scope">
<span>{{ getName(supplierList, scope.row.supplierId) }}</span>

2
fuintAdmin/src/views/convenienceStore/supplier.vue
View File

@ -46,7 +46,7 @@
<el-table ref="tables" v-loading="loading" :data="list"
@selection-change="handleSelectionChange" :default-sort="defaultSort"
@sort-change="handleSortChange">
<el-table-column label="ID" prop="id" align="center" width="60"/>
<el-table-column type="index" width="80" align="center" label="序号"/>
<el-table-column label="供应商名称" prop="name" align="center"/>
<el-table-column label="联系人" prop="contacts" align="center">
<template slot-scope="scope">

68
fuintAdmin/src/views/feedBack/index.vue Normal file
View File

@ -0,0 +1,68 @@
<template>
<div>
<el-card class="card">
<div slot="header" class="clearfix">
<span>用户反馈</span>
</div>
<el-table style="margin-top: 20px" v-loading="loading" :data="list">
<el-table-column type="index" width="80" align="center" label="序号"/>
<el-table-column align="center" prop="userId" label="用户id"/>
<el-table-column align="center" prop="content" label="反馈内容"/>
<el-table-column align="center" prop="screenshot_url" label="截图信息">
<template slot-scope="scope">
<span v-if="JSON.parse(scope.row.screenshotUrl).length>0" v-for="(item,index) in JSON.parse(scope.row.screenshotUrl)" :key="index" >
<img class="list-avatar" :src="baseUrl + item">
</span>
<span v-if="scope.row.screenshotUrl=='[]'">暂无截图信息</span>
</template>
</el-table-column>
<el-table-column align="center" prop="createTime" label="创建时间"/>
</el-table>
<pagination
:total="total"
:page.sync="queryParams.page"
:limit.sync="queryParams.pageSize"
@pagination="getFeekBackList"
/>
</el-card>
</div>
</template>
<script>
import {listFeekBack} from "@/api/feedback/feedBack";
export default {
data(){
return {
baseUrl:process.env.VUE_APP_BASE_API,
list:[],
total:0,
loading:false,
queryParams:{
page:1,
pageSize:10,
},
}
},
created() {
this.getFeekBackList()
},
methods:{
getFeekBackList(){
this.loading = true;
listFeekBack(this.queryParams).then(res => {
this.list = res.data.records;
this.total = res.data.total;
this.loading = false;
})
}
}
}
</script>
<style lang="scss" scoped>
</style>

2
fuintAdmin/src/views/member/fixingLevel.vue
View File

@ -111,6 +111,7 @@
<el-table ref="tables" v-loading="loading" :data="listMember"
@selection-change="handleSelectionChange" :default-sort="defaultSort"
@sort-change="handleSortChange">
<el-table-column type="index" width="80" align="center" label="序号"/>
<el-table-column label="认证类型" prop="fixingLevelId" align="center">
<template slot-scope="scope">
<span>{{ scope.row.fixingLevelId ? getName(fixingLevelList, scope.row.fixingLevelId) : '-' }}</span>
@ -187,6 +188,7 @@
@selection-change="handleSelectionChange"
:default-sort="defaultSort"
@sort-change="handleSortChange">
<el-table-column type="index" width="80" align="center" label="序号"/>
<el-table-column label="认证类型名称" align="center" prop="name">
<template slot-scope="scope">
{{ scope.row.name }}

2
fuintAdmin/src/views/member/index.vue
View File

@ -164,7 +164,7 @@
<el-table ref="tables" v-loading="loading" :data="list"
@selection-change="handleSelectionChange" :default-sort="defaultSort"
@sort-change="handleSortChange">
<el-table-column label="会员ID" prop="id" align="center" width="60"/>
<el-table-column type="index" width="60" align="center" label="序号"/>
<el-table-column label="头像" align="center" width="70">
<template slot-scope="scope">
<img v-if="scope.row.avatar" class="list-avatar" :src="baseUrl + scope.row.avatar">

15
fuintAdmin/src/views/member/userInfo.vue
View File

@ -121,19 +121,19 @@
<el-card :key="childComponentKey">
<template>
<el-tabs v-model="activeName" @tab-click="handleClick">
<el-tab-pane label="加油订单" name="refuelOrder">
<el-tab-pane label="油品订单" name="refuelOrder">
<oilOrder :key="childComponentKey" :pUserId="form.id"></oilOrder>
</el-tab-pane>
<el-tab-pane label="商品订单" name="shopOrder">
<goodsOrder :key="childComponentKey" :pUserId="form.id"></goodsOrder>
</el-tab-pane>
<el-tab-pane label="余额记录" name="balanceRecord">
<el-tab-pane label="余额记录（储值卡/囤油卡消费、充值记录）" name="balanceRecord">
<balanceRecord :key="childComponentKey" :pUserId="form.id"></balanceRecord>
</el-tab-pane>
<el-tab-pane label="积分记录" name="pointRecord">
<pointsRecord :key="childComponentKey" :pUserId="form.id"></pointsRecord>
</el-tab-pane>
<el-tab-pane label="卡券列表" name="cardList">
<el-tab-pane label="卡券记录" name="cardList">
<couponList :key="childComponentKey" :pUserId="form.id"></couponList>
</el-tab-pane>
<el-tab-pane label="成长值记录" name="growthValue">
@ -613,7 +613,7 @@
type="info"
style="margin-top: 20px"
:closable="false"
description="子卡为会员子母卡功能,子卡共享母卡的储值额度及信息,子卡为实体会员卡信息,消费需在小程序中才可进行使用">
description="子卡为会员子母卡功能,子卡共享母卡的储值额度及信息,子卡为实体会员卡信息,消费需在小程序中才可进行使用,一个会员最多只能添加两张子卡">
</el-alert>
</el-tab-pane>
<el-tab-pane label="子卡消费记录" name="consumption">
@ -775,7 +775,7 @@
<el-col :span="24">
<el-form-item label="子卡手机号" prop="cardChildPhones" style="width: 420px">
<el-input
v-model.number="form1.cardChildPhones"
v-model.number="cardChildPhones"
placeholder="请输入子卡手机号"
/>
</el-form-item>
@ -956,6 +956,7 @@ export default {
form: {},
refuelMoney:0,
form1: {},
cardChildPhones: "",
// 加油总金额
allAmount:0,
// 店铺信息
@ -1053,11 +1054,14 @@ export default {
},
handleAdd1(){
this.title = "添加子卡信息"
this.form1.userId = this.form.id
this.cardChildPhones = ""
this.openSubCard1 = true
},
handleUpdate1(data){
cardValueChildInfo(data.id).then(res => {
this.form1 = res.data
this.cardChildPhones = res.data.cardChildPhones
this.title = "修改子卡信息"
this.openSubCard1 = true
})
@ -1066,6 +1070,7 @@ export default {
submitSubCard(){
this.$refs["form1"].validate(valid => {
if (valid) {
this.form1.cardChildPhones = this.cardChildPhones
if (this.form1.id) {
editCardValueChild(this.form1).then(res => {
if (res.data==1){

2
fuintAdmin/src/views/member/userInfoOrder/balanceRecord.vue
View File

@ -2,7 +2,7 @@
<div>
<el-radio-group v-model="tabPosition" size="mini" style="margin-bottom: 30px;">
<el-radio-button label="giftCard">储值卡记录</el-radio-button>
<el-radio-button label="literCard">升数卡记录</el-radio-button>
<el-radio-button label="literCard">囤油卡记录</el-radio-button>
</el-radio-group>
<div v-if="tabPosition=='giftCard'">
<el-table key="1" ref="tables" v-loading="loading" :data="cardList">

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

@ -509,6 +509,8 @@ export default {
type: 'success',
message: '支付通道切换成功,已实时切换为商户号('+data.mchntCd+')'
});
this.value1 = true;
this.changeStatus1();
})
}).catch(() => {});
},
@ -528,7 +530,7 @@ export default {
})
},
open() {
this.$confirm('此操作会发布件, 是否继续?', '提示', {
this.$confirm('此操作会发布事件, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'

2
fuintAdmin/src/views/staff/list.vue
View File

@ -58,7 +58,7 @@
</el-row>
<el-table ref="tables" v-loading="loading" :data="list" @selection-change="handleSelectionChange" :default-sort="defaultSort" @sort-change="handleSortChange">
<el-table-column label="ID" align="center" prop="id" width="80" />
<el-table-column type="index" width="80" align="center" label="序号"/>
<el-table-column label="姓名" align="center" prop="realName" />
<el-table-column label="员工角色" align="center" prop="roleId" >
<template slot-scope="scope">

26
fuintAdmin/src/views/staff/storeInfo/index.vue
View File

@ -32,27 +32,27 @@
<el-card class="card">
<div slot="header" class="clearfix">
<span>门店二维码</span>
<span>油站二维码</span>
</div>
<img id="collection" class="qrcode" :src="collectionImg" /><br/>
<el-button class="but" type="primary"
icon="el-icon-download"
@click="handleDownloadqrCode('collection')">
下载门店二维码
下载油站二维码
</el-button>
</el-card>
<el-card class="card">
<div slot="header" class="clearfix">
<span>收款二维码</span>
</div>
<img id="payment" class="qrcode" :src="paymentImg" /><br/>
<el-button class="but" type="primary"
icon="el-icon-download"
@click="handleDownloadqrCode('payment')">
下载收款二维码
</el-button>
</el-card>
<!-- <el-card class="card">-->
<!-- <div slot="header" class="clearfix">-->
<!-- <span>收款二维码</span>-->
<!-- </div>-->
<!-- <img id="payment" class="qrcode" :src="paymentImg" /><br/>-->
<!-- <el-button class="but" type="primary"-->
<!-- icon="el-icon-download"-->
<!-- @click="handleDownloadqrCode('payment')">-->
<!-- 下载收款二维码-->
<!-- </el-button>-->
<!-- </el-card>-->
</div>
</template>
<script>

69
fuintAdmin/src/views/staffCommission/staffCommission.vue
View File

@ -53,24 +53,56 @@
</el-form-item>
</el-form>
</div>
<el-card class="box-card">
<div slot="header" class="clearfix">
<span>会员充值统计</span>
</div>
<div class="box-gang">
<div class="box">
<div class="size-hui">提成笔数</div>
<div class="size-bole">{{ total1 }}</div>
</div>
<div class="box">
<div class="size-hui">提成金额</div>
<div class="size-bole">{{ allAmount }}</div>
</div>
</div>
</el-card>
<!-- <el-card class="box-card">-->
<!-- <div slot="header" class="clearfix">-->
<!-- <span>会员充值统计</span>-->
<!-- </div>-->
<!-- <div class="box-gang">-->
<!-- <div class="box">-->
<!-- <div class="size-hui">提成笔数</div>-->
<!-- <div class="size-bole">{{ total1 }}</div>-->
<!-- </div>-->
<!-- <div class="box">-->
<!-- <div class="size-hui">提成金额</div>-->
<!-- <div class="size-bole">{{ allAmount }}</div>-->
<!-- </div>-->
<!-- </div>-->
<!-- </el-card>-->
<!-- <div style="margin-top: 20px" v-if="activeName=='staffCommission'">-->
<!-- <el-table ref="tables" v-loading="loading" :data="staffCommissionList">-->
<!-- <el-table-column type="index" width="80" align="center" label="序号"/>-->
<!-- <el-table-column label="员工信息" align="center">-->
<!-- <el-table-column label="姓名" prop="realName" align="center"/>-->
<!-- <el-table-column label="手机号" prop="mobile" align="center"/>-->
<!-- </el-table-column>-->
<!-- <el-table-column label="提成类型" align="center" >-->
<!-- <el-table-column label="油卡充值" prop="realName" align="center"/>-->
<!-- <el-table-column label="囤油卡充值" prop="mobile" align="center"/>-->
<!-- <el-table-column label="车主加油" prop="mobile" align="center"/>-->
<!-- <el-table-column label="非油品" prop="mobile" align="center"/>-->
<!-- </el-table-column>-->
<!-- <el-table-column label="汇总" prop="amount" align="center" width="260"/>-->
<!-- <el-table-column label="详情" prop="createTime" align="center" width="160">-->
<!-- <template slot-scope="scope">-->
<!-- <span>查看详情</span>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- </el-table>-->
<!-- <pagination-->
<!-- v-show="total1>0"-->
<!-- :total="total1"-->
<!-- :page.sync="queryParams1.page"-->
<!-- :limit.sync="queryParams1.pageSize"-->
<!-- @pagination="getCommissionList"-->
<!-- />-->
<!-- </div>-->
<div style="margin-top: 20px" v-if="activeName=='staffCommission'">
<el-table ref="tables" v-loading="loading" :data="commissionList">
<el-table-column label="ID" prop="id" align="center" width="60"/>
<el-table-column type="index" width="80" align="center" label="序号"/>
<el-table-column label="员工信息" align="center">
<el-table-column label="姓名" prop="realName" align="center"/>
<el-table-column label="手机号" prop="mobile" align="center"/>
@ -121,7 +153,7 @@
<el-table ref="tables" v-loading="loading" :data="list"
@selection-change="handleSelectionChange" :default-sort="defaultSort"
@sort-change="handleSortChange">
<el-table-column label="ID" prop="id" align="center" width="60"/>
<el-table-column type="index" width="80" align="center" label="序号"/>
<el-table-column label="方案名称" prop="name" align="center"/>
<el-table-column label="员工角色" prop="dutyName" align="center">
<!-- <template slot-scope="scope">-->
@ -328,6 +360,7 @@ export default {
// 表格数据
list: [],
commissionList: [],
staffCommissionList: [],
// 是否显示修改对话框
open: false,
// 默认排序
@ -374,7 +407,7 @@ export default {
{ required: true, message: "请填写提成消费条件", trigger: "blur" },
],
royaltyRate: [
{ required: true, message: "请填写油品提成", trigger: "blur" },
{ required: true, message: "请填写提成金额/提成比例", trigger: "blur" },
],
// takeEffect: [
// { required: true, message: "请选择方案生效时间", trigger: "change" },

6
fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/mapper/xml/StockStatisticMapper.xml
View File

@ -11,7 +11,7 @@
<select id="selectStockList" resultType="com.fuint.business.convenienceSore.vo.StockStatisticVo">
<include refid="selectStock"></include>
<where>
st.store_id = #{stock.storeId} and if_delete = '0'
st.store_id = #{stock.storeId} and mg.if_delete = '0'
<if test="stock.cvsGoodId != null and stock.cvsGoodId != ''">
and st.cvs_good_id = #{stock.cvsGoodId}
</if>
@ -39,14 +39,14 @@
parameterType="java.lang.Integer">
<include refid="selectStock"></include>
<where>
st.id = #{id} and if_delete = '0'
st.id = #{id} and mg.if_delete = '0'
</where>
</select>
<select id="selectStocks" resultType="com.fuint.business.convenienceSore.vo.StockStatisticVo"
parameterType="java.lang.Integer">
<include refid="selectStock"></include>
<where>
st.store_id = #{stock.storeId} and if_delete = '0'
st.store_id = #{stock.storeId} and mg.if_delete = '0'
<if test="stock.cvsGoodId != null and stock.cvsGoodId != ''">
and st.cvs_good_id = #{stock.cvsGoodId}
</if>

16
fuintBackend/fuint-application/src/main/java/com/fuint/business/member/controller/LJStaffController.java
View File

@ -8,6 +8,7 @@ import com.fuint.common.dto.AccountInfo;
import com.fuint.common.util.TokenUtil;
import com.fuint.framework.web.BaseController;
import com.fuint.framework.web.ResponseObject;
import org.apache.commons.lang3.StringUtils;
import org.apache.ibatis.annotations.Param;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
@ -49,6 +50,21 @@ public class LJStaffController extends BaseController {
return getSuccessResult(list);
}
/**
* 查询当前店铺所有加油员信息
* @return
*/
@PostMapping("/queryList")
public ResponseObject queryStaffs(@RequestBody Map<String,String> map){
String str = map.get("storeId");
Integer storeId = null;
if (StringUtils.isNotEmpty(str)){
storeId = Integer.valueOf(str);
}
List<LJStaff> list = mtStaffService.queryStaffLists(storeId);
return getSuccessResult(list);
}
/**
* 根据id查询员工信息
* @param id

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

@ -30,6 +30,12 @@ public interface ILJStaffService extends IService<LJStaff> {
*/
public List<LJStaff> queryStaffList();
/**
* 查询当前店铺所有加油员信息
* @return
*/
public List<LJStaff> queryStaffLists(Integer storeId);
/**
* 根据id查询员工信息
* @param id

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

@ -77,6 +77,20 @@ public class LJStaffServiceImpl extends ServiceImpl<LJStaffMapper, LJStaff> impl
return list;
}
@Override
public List<LJStaff> queryStaffLists(Integer storeId) {
if (storeId==null){
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
storeId = nowAccountInfo.getStoreId();
}
QueryWrapper queryWrapper = new QueryWrapper<>();
queryWrapper.eq("store_id",storeId);
queryWrapper.eq("status","qy");
queryWrapper.eq("role_id","15");
List list = baseMapper.selectList(queryWrapper);
return list;
}
/**
* 根据id查询员工信息
* @param id

2
fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/mapper/xml/FeedbackMapper.xml
View File

@ -20,7 +20,7 @@
<if test="feedback.params.endTime != null and feedback.params.endTime != ''"><!-- 结束时间检索 -->
and date_format(create_time,'%y%m%d') &lt;= date_format(#{feedback.params.endTime},'%y%m%d')
</if>
order by create_time desc
</where>
order by create_time desc
</select>
</mapper>

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

@ -14,6 +14,8 @@ import org.springframework.stereotype.Service;
public class FeedbackServiceImpl extends ServiceImpl<FeedbackMapper,Feedback> implements FeedbackService {
@Override
public IPage<Feedback> selectFeedbackList(Page page, Feedback feedback) {
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
feedback.setStoreId(nowAccountInfo.getStoreId());
return baseMapper.selectFeedbackList(page,feedback);
}

9
fuintCashierWeb/src/api/cashier/staff.js
View File

@ -17,6 +17,15 @@ export function queryStaffs() {
})
}
// 查询所有员工
export function queryStaffList(data) {
return request({
url: '/business/member/staff/queryList',
method: 'post',
data:data
})
}
// 查询员工详细
export function getStaff(id) {
return request({

9
fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue
View File

@ -426,8 +426,8 @@
<span style="display: flex;justify-content: space-between">
<el-button class="elBut" @click="dialogTakeOrder = false" round>返 回</el-button>
<span>
<el-button class="elBut" type="danger" @click="cancel" round>作 废</el-button>
<el-button class="elBut" type="success" @click="pickOrder" round>取 单</el-button>
<el-button class="elBut" :disabled="registrationList.length==0" type="danger" @click="cancel" round>作 废</el-button>
<el-button class="elBut" :disabled="registrationList.length==0" type="success" @click="pickOrder" round>取 单</el-button>
</span>
</span>
</el-dialog>
@ -803,7 +803,7 @@
import {getOilNameList, getOilNumGun, listOilNumGun} from "@/api/cashier/oilnumgun";
import {listgoods} from "@/api/cashier/ljgoods";
import {getUserInfoMobile, getUserVoMobile, getUserVoName} from "@/api/cashier/user";
import {queryStaffs, staffInfo} from "@/api/cashier/staff";
import {queryStaffList, queryStaffs, staffInfo} from "@/api/cashier/staff";
import {addLJGoods, goodsOrder, oilOrder, scanAppletQrCode} from "@/api/cashier/oilorder";
import {getUserGrade, listUserGrade, userGradeInfo} from "@/api/cashier/usergrade";
import {getOilGun, getOilTank} from "@/api/cashier/oilGuns";
@ -1551,6 +1551,7 @@
// 挂单
registration(){
this.dialogRegistration = false;
this.registrationRemark = "";
this.registrationList.push({menu:this.menu,children:this.goodsOrder})
this.menu++;
this.goodsOrder = [];
@ -2273,7 +2274,7 @@
},
// 获取员工列表
getStaffList(){
queryStaffs().then( response => {
queryStaffList({storeId:""}).then( response => {
this.staffList = response.data
})
},

15
fuintCashierWeb/src/views/details/index.vue
View File

@ -122,19 +122,19 @@
<el-card :key="childComponentKey" class="_l">
<el-tabs v-model="activeName" @tab-click="handleClick">
<el-tab-pane label="加油订单" name="refuelOrder">
<el-tab-pane label="油品订单" name="refuelOrder">
<oilOrder :key="childComponentKey" :pUserId="form.id"></oilOrder>
</el-tab-pane>
<el-tab-pane label="商品订单" name="shopOrder">
<goodsOrder :key="childComponentKey" :pUserId="form.id"></goodsOrder>
</el-tab-pane>
<el-tab-pane label="余额记录" name="balanceRecord">
<el-tab-pane label="余额记录（储值卡/囤油卡消费、充值记录）" name="balanceRecord">
<balanceRecord :key="childComponentKey" :pUserId="form.id"></balanceRecord>
</el-tab-pane>
<el-tab-pane label="积分记录" name="pointRecord">
<pointsRecord :key="childComponentKey" :pUserId="form.id"></pointsRecord>
</el-tab-pane>
<el-tab-pane label="卡券列表" name="cardList">
<el-tab-pane label="卡券记录" name="cardList">
<couponList :key="childComponentKey" :pUserId="id"></couponList>
</el-tab-pane>
<el-tab-pane label="成长值记录" name="growthValue">
@ -617,7 +617,7 @@
type="info"
style="margin-top: 20px"
:closable="false"
description="子卡为会员子母卡功能,子卡共享母卡的储值额度及信息,子卡为实体会员卡信息,消费需在小程序中才可进行使用">
description="子卡为会员子母卡功能,子卡共享母卡的储值额度及信息,子卡为实体会员卡信息,消费需在小程序中才可进行使用,一个会员最多只能添加两张子卡">
</el-alert>
</el-tab-pane>
<el-tab-pane label="子卡消费记录" name="consumption">
@ -774,7 +774,7 @@
<el-col :span="24">
<el-form-item label="子卡手机号" prop="cardChildPhones" style="width: 420px">
<el-input
v-model.number="form1.cardChildPhones"
v-model.number="cardChildPhones"
placeholder="请输入子卡手机号"
/>
</el-form-item>
@ -801,6 +801,7 @@ import couponList from "@/views/details/userInfoOrder/couponList.vue";
import growthValueRecord from "@/views/details/userInfoOrder/growthValueRecord.vue";
import refuelMoneyRecord from "@/views/details/userInfoOrder/refuelMoneyRecord.vue";
import cardValueChild from "@/views/details/userInfoOrder/cardValueChild.vue";
import BigNumber from 'bignumber.js';
import {
addCardValueChild,
cardValueChildInfo,
@ -955,6 +956,7 @@ export default {
form: {},
refuelMoney:0,
form1: {},
cardChildPhones: '',
// 加油总金额
allAmount:0,
// 店铺信息
@ -1061,6 +1063,8 @@ export default {
},
handleAdd1(){
this.title = "添加子卡信息"
this.form1.userId = this.form.id
this.cardChildPhones = ""
this.openSubCard1 = true
},
handleUpdate1(data){
@ -1074,6 +1078,7 @@ export default {
submitSubCard(){
this.$refs["form1"].validate(valid => {
if (valid) {
this.form1.cardChildPhones = this.cardChildPhones
if (this.form1.id) {
editCardValueChild(this.form1).then(res => {
if (res.data==1){

2
fuintCashierWeb/src/views/details/userInfoOrder/balanceRecord.vue
View File

@ -2,7 +2,7 @@
<div>
<el-radio-group v-model="tabPosition" size="mini" style="margin-bottom: 30px;">
<el-radio-button label="giftCard">储值卡记录</el-radio-button>
<el-radio-button label="literCard">升数卡记录</el-radio-button>
<el-radio-button label="literCard">囤油卡记录</el-radio-button>
</el-radio-group>
<div v-if="tabPosition=='giftCard'">
<el-table key="1" ref="tables" v-loading="loading" :data="cardList">

2
gasStation-uni/pages/my/my.vue
View File

@ -63,7 +63,7 @@
<image src="../../static/my/dsy.png" mode="aspectFit"></image>
</view>
<view class="centenr-size">
待使用
待支付
</view>
</view>

55
gasStation-uni/pages/refuel/refuel.vue
View File

@ -29,7 +29,53 @@
</view>
<view style="height: 390px;overflow-y: scroll;">
<view v-if="appltType == 'ALIPAY'" style="height: 400px;overflow-y: scroll;">
<view class="fa-box">
<view class="fa-title">选择油号 <text class="top-hui"> 请务必与员工确认类型</text> </view>
<view class="wrap-box">
<!-- <view class="box-oil" :class=" {'xz' :hindex == index }" @click="getHIndex(index)"
v-for="(item,index) in 4" :key="index">
<text>92#</text>
</view> -->
<view class="box-oil" v-for="(item,index) in oilNumberList" :key="index"
:class=" {'xz' :hindex == index }" @click="getHIndex(index,item)">
<text>{{item.oilName}}</text>
</view>
</view>
</view>
<view class="fa-box">
<view class="fa-title">选择油枪 <text class="top-hui"> 请务必与员工确认枪号</text> </view>
<view class="wrap-box">
<!-- <view class="box-oil" :class=" {'xz' :qindex == index }" @click="getQIndex(index)"
v-for="(item,index) in 8" :key="index">
<text>{{index}}号枪</text>
</view> -->
<view class="box-oil" :class=" {'xz' :qindex == index }" v-for="(item,index) in oilGunList"
:key="index" @click="getQIndex(index,item)">
<text>{{item.gunName}}</text>
</view>
</view>
</view>
<view class="fa-box">
<view class="fa-title">请输入加油金额</view>
<view class="inputkuang" @click="openKey">
<view class="sbox">￥</view>
<view class="sbox" style="text-align: center;font-weight: bold;">{{value}}</view>
<view class="sbox-hui">约{{liters}}L</view>
</view>
<view class="wrap-box">
<view class="box-oil1" :class=" {'xz' :aindex == index }" @click="getAIndex(index,item)"
v-for="(item,index) in amountList" :key="index">
<text>￥{{item}}</text>
</view>
</view>
</view>
<view class="anniu" @click="submitAmount">
<text>立即加油</text>
</view>
</view>
<view v-if="appltType == 'WECHAT'" style="height: 500px;overflow-y: scroll;">
<view class="fa-box">
<view class="fa-title">选择油号 <text class="top-hui"> 请务必与员工确认类型</text> </view>
<view class="wrap-box">
@ -339,8 +385,9 @@
getStaffList(storeId) {
let _this = this;
request({
url: "business/member/staff/queryStaffList/" + storeId,
method: 'get',
url: "business/member/staff/queryList",
method: 'post',
data:{storeId:storeId}
}).then((res) => {
_this.staffList = res.data
})
@ -435,7 +482,7 @@
} else {
if (this.value != "" && this.qindex != null) {
this.show = false
if (uni.getStorageSync("inviteStaffId")) {
if (uni.getStorageSync("inviteStaffId") || this.staffList.length==0) {
this.toPayment(uni.getStorageSync("inviteStaffId"))
} else {
this.$refs.popup.open('bottom')

7
gasStation-uni/pagesMy/feedback/feedback.vue
View File

@ -52,6 +52,13 @@
methods: {
// 提交反馈
submitFeedback(){
if (!this.value5){
uni.showToast({
title:"请填写反馈信息",
icon:"none"
})
return;
}
this.feedback.content = this.value5
this.feedback.screenshotUrl = JSON.stringify(this.images)
request({

2
gasStation-uni/pagesRefuel/orderDetail/index.vue
View File

@ -34,7 +34,7 @@
</view>
<view class="desc">
<view>加油员工</view>
<view>{{oilOrder.realName}}</view>
<view>{{oilOrder.realName || "--"}}</view>
</view>
</view>