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

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
sw 2024-11-20 16:34:30 +08:00
commit bdf5a93298
24 changed files with 838 additions and 725 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
fuintAdmin/src/api/integral/category.js
View File

@ -24,5 +24,13 @@ export function getGiftCategoryApi(data) {
data: data
})
}
// 删除有关信息
export function deleteGiftCategoryApi(id) {
return request({
url: 'business/integral/integralGiftCategory',
method: 'delete',
params: id
})
}

52
fuintAdmin/src/views/EventMarketing/center/index.vue
View File

@ -222,28 +222,33 @@
:data="tableData"
border
style="width: 100%">
<el-table-column type="selection" width="55"></el-table-column>
<el-table-column type="index" label="序号" width="55"></el-table-column>
<el-table-column prop="typeText" label="活动类型"></el-table-column>
<el-table-column prop="name" label="活动名称"></el-table-column>
<el-table-column prop="discountActiveDescribe" label="活动内容"></el-table-column>
<el-table-column prop="time" label="活动时间">
<el-table-column type="selection" align="center" width="55"></el-table-column>
<el-table-column type="index" label="序号" align="center" width="55"></el-table-column>
<el-table-column prop="typeText" label="活动类型" align="center"></el-table-column>
<el-table-column prop="name" label="活动名称" align="center"></el-table-column>
<el-table-column prop="discountActiveDescribe" label="活动内容" align="center"></el-table-column>
<el-table-column prop="time" label="活动时间" align="center">
<template slot-scope="scope">
<span v-if="scope.row.time==0">不限时间</span>
<span v-else>{{ scope.row.activeStartTime }} ~ {{ scope.row.activeEndTime }}</span>
</template>
</el-table-column>
<el-table-column prop="userGradeName" label="适用会员等级">
<el-table-column prop="userGradeName" label="适用会员等级" align="center">
<template slot-scope="scope">
<span>{{ scope.row.userGradeName || "--" }}</span>
</template>
</el-table-column>
<el-table-column prop="sendNum" label="已领数量">
<el-table-column prop="discountActiveDescribe" label="活动详情" align="center">
<template slot-scope="scope">
<span>{{ scope.row.discountActiveDescribe || "--" }}</span>
</template>
</el-table-column>
<el-table-column prop="sendNum" label="已领数量" align="center">
<template slot-scope="scope">
<span>{{ scope.row.sendNum || 0 }}</span>
</template>
</el-table-column>
<el-table-column prop="activeStatus" label="状态">
<el-table-column prop="activeStatus" label="状态" align="center">
<template slot-scope="scope">
<el-switch
v-model="scope.row.activeStatus"
@ -255,8 +260,8 @@
</el-switch>
</template>
</el-table-column>
<el-table-column prop="createName" label="创建人"></el-table-column>
<el-table-column prop="createTime" label="创建时间"></el-table-column>
<el-table-column prop="createName" label="创建人" align="center"></el-table-column>
<el-table-column prop="createTime" label="创建时间" align="center"></el-table-column>
<el-table-column prop="date" label="操作" align="center">
<template slot-scope="scope">
<el-button
@ -321,23 +326,28 @@
type="selection"
width="55">
</el-table-column>
<el-table-column type="index" label="序号" width="55"></el-table-column>
<el-table-column prop="typeText" label="活动类型"></el-table-column>
<el-table-column prop="name" label="活动名称"></el-table-column>
<el-table-column prop="discountActiveDescribe" label="活动内容"></el-table-column>
<el-table-column prop="time" label="活动时间">
<el-table-column type="index" label="序号" width="55" align="center"></el-table-column>
<el-table-column prop="typeText" label="活动类型" align="center"></el-table-column>
<el-table-column prop="name" label="活动名称" align="center"></el-table-column>
<el-table-column prop="discountActiveDescribe" label="活动内容" align="center"></el-table-column>
<el-table-column prop="time" label="活动时间" align="center">
<template slot-scope="scope">
<span v-if="scope.row.time==0">不限时间</span>
<span v-else>{{ scope.row.activeStartTime }} ~ {{ scope.row.activeEndTime }}</span>
</template>
</el-table-column>
<el-table-column prop="userGradeName" label="适用会员等级">
<el-table-column prop="userGradeName" label="适用会员等级" align="center">
<template slot-scope="scope">
<span>{{ scope.row.userGradeName || "--" }}</span>
</template>
</el-table-column>
<el-table-column prop="sendNum" label="已领数量"></el-table-column>
<el-table-column prop="activeStatus" label="状态">
<el-table-column prop="discountActiveDescribe" label="活动详情" align="center">
<template slot-scope="scope">
<span>{{ scope.row.discountActiveDescribe || "--" }}</span>
</template>
</el-table-column>
<el-table-column prop="sendNum" label="已领数量" align="center"></el-table-column>
<el-table-column prop="activeStatus" label="状态" align="center">
<template slot-scope="scope">
<el-switch
v-model="scope.row.activeStatus"
@ -350,8 +360,8 @@
</template>
</el-table-column>
<el-table-column prop="createName" label="创建人"></el-table-column>
<el-table-column prop="createTime" label="创建时间"></el-table-column>
<el-table-column prop="createName" label="创建人" align="center"></el-table-column>
<el-table-column prop="createTime" label="创建时间" align="center"></el-table-column>
<el-table-column prop="date" label="操作" align="center">
<template slot-scope="scope">
<el-button

1338
fuintAdmin/src/views/EventMarketing/storeOilBlock/index.vue
View File

File diff suppressed because it is too large Load Diff

45
fuintAdmin/src/views/integral/giftCategory/index.vue
View File

@ -53,7 +53,7 @@
width="50">
</el-table-column>
<el-table-column label="分类名称" align="center" prop="categoryName"/>
<el-table-column label="创建人" align="createBy" prop="sort" />
<el-table-column label="创建人" align="center" prop="createByName" />
<el-table-column label="状态" align="center" prop="status">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
@ -68,11 +68,17 @@
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['integral:giftCategory:index:update']"
>修改</el-button>
<el-button
size="mini"
type="text"
@click="handleDelete(scope.row)"
v-hasPermi="['integral:giftCategory:index:update']"
>删除</el-button>
</template>
<!-- v-hasPermi="['']"-->
</el-table-column>
@ -102,8 +108,8 @@
:value="dict.value"/>
</el-radio-group>
</el-form-item>
<el-form-item label="备注" prop="categoryName">
<el-input type="textarea" :rows="6" v-model="dataForm.remark" placeholder="分类名称" maxlength="30"/>
<el-form-item label="备注" >
<el-input type="textarea" :rows="6" v-model="dataForm.remark" placeholder="请输入备注" maxlength="30"/>
</el-form-item>
@ -120,7 +126,12 @@
<script>
import {getGiftCategoryApi,insertGiftCategoryApi,updateGiftCategoryApi } from "@/api/integral/category";
import {
deleteGiftCategoryApi,
getGiftCategoryApi,
insertGiftCategoryApi,
updateGiftCategoryApi
} from "@/api/integral/category";
export default {
name: "giftCategory",
@ -228,6 +239,30 @@ export default {
this.open = true
this.getList();
},
// 删除信息
handleDelete(data){
this.$confirm('是否删除本条数据，删除后无法恢复!', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
deleteGiftCategoryApi({id:data.id}).then(res=>{
if (res.code == 200) {
this.$message({
type: 'success',
message: '删除成功!'
});
this.getList()
}
})
}).catch(() => {
this.$message({
type: 'info',
message: '已取消删除'
});
});
},
resetQuery(){
this.queryParams = {}
this.getList();

1
fuintAdmin/src/views/order/order_Added.vue
View File

@ -105,6 +105,7 @@
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
v-if="scope.row.status != 0"
size="mini"
type="text"
@click="returnRecord(scope.row.id)"

3
fuintAdmin_zt/src/views/Service/index.vue
View File

@ -50,7 +50,7 @@
</div>
</div>
<div style="width: 100%;height: 74vh;overflow: auto;scrollbar-width: none">
<div style="width: 100%;height: 75vh;overflow: auto;scrollbar-width: none">
<el-table
:data="tableData"
@ -382,6 +382,7 @@ export default {
background: #f9f9f9;
box-sizing: border-box;
padding: 10px;
padding-bottom: 0px;
}
.ding-top{
width: 100%;

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

@ -72,7 +72,7 @@
</el-form-item>
</el-form>
<div style="width: 100%;height: 73vh;overflow: auto">
<div style="width: 100%;height: 74vh;overflow: auto">
<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" type="index" />
<el-table-column label="订单号" align="center" prop="orderNo" width="220"/>
@ -350,6 +350,7 @@
background: #f9f9f9;
box-sizing: border-box;
padding: 10px;
padding-bottom: 0px;
}
.bai-box{

14
fuintAdmin_zt/src/views/components/Service/index.vue
View File

@ -53,18 +53,18 @@
</div>
<div class="bottom-box2">
<div style="height: 200px; width: 300px;">
<div class="demonstration" style="font-weight: bold;margin-bottom: 10px" >营业执照</div>
<br/>
<div class="demonstration" style="font-size: 16px;font-weight: bold;margin-bottom: 0px;margin-bottom: 15px" >营业执照</div>
<el-image v-if="from.license" :src="imagePath+from.license" style="margin-top: 10px;width: 220px;height: 135px;border-radius: 3%;" ></el-image>
<el-image v-if="from.license" :src="imagePath+from.license" style="margin-top: 8px;width: 220px;height: 135px;border-radius: 3%;" ></el-image>
<el-image v-else src="https://cube.elemecdn.com/e/fd/0fc7d20532fdaf769a25683617711png.png" ></el-image>
</div>
<div style=" width: 1000px; margin-left: 30px;">
<div class="demonstration" style="font-weight: bold;margin-bottom: 10px" >经营照</div>
<br/>
<div class="demonstration" style="font-size: 16px; font-weight: bold;margin-bottom: 0px;margin-bottom: 15px" >经营照</div>
<div style="width: 1220px;display: flex">
<el-image v-for="(item, index) in from.doorstepPhoto" v-if="from.doorstepPhoto[0]" :src="imagePath+item" style="margin-top: 10px;margin-right:10px;width: 220px;height: 135px;display: flex;border-radius: 3%; "></el-image>
<el-image v-for="(item, index) in from.doorstepPhoto" v-if="from.doorstepPhoto[0]" :src="imagePath+item" style="margin-top: 8px;margin-right:10px;width: 220px;height: 135px;display: flex;border-radius: 3%; "></el-image>
<el-image v-else src="https://cube.elemecdn.com/e/fd/0fc7d20532fdaf769a25683617711png.png" style="border-radius: 3%;"></el-image>
</div>
@ -546,7 +546,7 @@
.box-h{
background: rgb(255, 255, 255);
width: 100%;
height: 82vh;
height: 84vh;
box-sizing: border-box;
padding: 10px;
}

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

@ -989,11 +989,12 @@ export default {
background: #f9f9f9;
box-sizing: border-box;
padding: 10px;
padding-bottom: 0px;
}
.new-box {
width: 100%;
height: 82vh;
height: 84vh;
overflow: auto;
background: #fff;
box-sizing: border-box;

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

@ -36,7 +36,7 @@
</el-button>
</div>
</div>
<div style="width: 100%;height: 74vh;overflow: auto">
<div style="width: 100%;height: 69vh;overflow: auto">
<el-table ref="tables" border v-loading="loading" :data="list" @selection-change="handleSelectionChange"
:default-sort="defaultSort" @sort-change="handleSortChange">
<el-table-column

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

@ -117,7 +117,7 @@ export default {
box-sizing: border-box;
padding: 10px;
width: 99%;
height: 83vh;
height: 84vh;
overflow: auto;
margin: 10px auto;
margin-bottom: 0px;

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

@ -1,7 +1,7 @@
<!-- 收银台订单-->
<template>
<div style="background: #f6f8f9;width: 100%;padding: 10px;padding-bottom: 0px">
<div class="card-change">
<div class="card-changessss">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px">
<el-form-item label="" prop="deptId" style="width: 180px">
<el-select
@ -282,11 +282,16 @@ import {getDuiZhangIntegralListApi} from "@/api/financialStatement/jiaoyiduizhan
.table-box{
width: 100%;
height: 75vh;
min-height: 650px;
height: 72vh;
overflow: auto;
scrollbar-width: none;
}
.card-changessss{
height: 85vh;
background: #fff;
box-sizing: border-box;
padding: 10px;
border-radius: 8px;
}
</style>

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

@ -1,7 +1,7 @@
<!-- 收银台订单-->
<template>
<div style="background: #f6f8f9;width: 100%;padding: 10px;padding-bottom: 0px">
<div class="card-change">
<div class="card-changessss">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px">
<el-form-item label="" prop="deptId" style="width: 180px">
<el-select
@ -283,10 +283,15 @@ import {getDuiZhangGoodsListApi} from "@/api/financialStatement/jiaoyiduizhang";
.table-box{
width: 100%;
height: 75vh;
min-height: 650px;
height: 72vh;
overflow: auto;
scrollbar-width: none;
}
.card-changessss{
height: 85vh;
background: #fff;
box-sizing: border-box;
padding: 10px;
border-radius: 8px;
}
</style>

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

@ -1,7 +1,7 @@
<!-- 收银台订单-->
<template>
<div style="background: #f6f8f9;width: 100%;padding: 10px;padding-bottom: 0px" >
<div class="card-change">
<div class="card-changessss">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="120px">
<el-form-item label="" prop="deptId" style="width: 180px">
<el-select
@ -281,9 +281,17 @@ import {getRunningWaterByTissueApi} from "@/api/allOrder";
.table-box{
width: 100%;
height: 74vh;
min-height: 650px;
overflow: auto;
scrollbar-width: none;
height: 71vh;
}
.card-changessss{
height: 85vh;
background: #fff;
box-sizing: border-box;
padding: 10px;
border-radius: 8px;
}
</style>

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

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

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

@ -294,7 +294,7 @@ export default {
}
.table-box{
width: 100%;
height: 57vh;
height: 63vh;
scrollbar-width: none;
overflow: auto;
}

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

@ -357,6 +357,8 @@ import {parseTime} from "@/utils/fuint";
padding: 10px;
width: 100%;
margin: 5px auto;
height:65vh;
margin-bottom: 0px;
}
.el-form--inline .el-form-item {

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

@ -103,14 +103,15 @@
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.page"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
</div>
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.page"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
</div>
@ -323,7 +324,7 @@ import {parseTime} from "@/utils/fuint";
}
.table-box{
width: 100%;
height: 57vh;
height: 63vh;
scrollbar-width: none;
overflow: auto;
}

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

@ -18,9 +18,6 @@
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
<!-- </el-card>-->
<!-- <el-card class="box-card">-->
<div class="wrap-box">
<div class="k_" id="k_1">
<div class="size_">会员总数</div>
@ -256,6 +253,8 @@ import {getFenXiUserbalanceDataApi, getFenXiUserbalanceListApi} from "@/api/fina
padding: 10px;
width: 100%;
margin: 5px auto;
margin-bottom: 0px;
height:67vh;
}
.el-form--inline .el-form-item {
margin-right: 20px;

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

@ -45,7 +45,7 @@
>新增商品</el-button>
</el-form-item>
</el-form>
<div style="height: 71vh; overflow: auto; scrollbar-width: none ">
<div style="height: 75vh; overflow: auto; scrollbar-width: none ">
<el-table :data="tableData" style="width: 100%" border>
<el-table-column type="index" label="序号"></el-table-column>
<el-table-column prop="name" label="商品名称"></el-table-column>

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

@ -40,7 +40,7 @@
/>
</el-select>
</el-form-item>
<el-form-item style="float: right">
<el-form-item >
<el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
<el-button

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

@ -411,6 +411,7 @@ export default {
display: flex;
box-sizing: border-box;
padding: 0px 50px;
border-top: 1px solid #f2f2f2;
}
.f-box{
@ -425,5 +426,8 @@ export default {
color: #FF9655 !important;
border-bottom: 2px solid #FF9655 !important;
}
.card-change{
height: 84vh;
}
</style>

4
fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/entity/IntegralGiftCategory.java
View File

@ -35,6 +35,10 @@ public class IntegralGiftCategory extends BaseEntity {
* 店铺ID
*/
private Integer storeId;
/**
* 创建人
*/
private String createByName;
}

4
fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/mapper/xml/IntegralGiftCategoryMapper.xml
View File

@ -23,9 +23,9 @@
</select>
<!--查询指定行数据-->
<select id="queryAllByLimit" resultMap="IntegralGiftCategoryMap">
<select id="queryAllByLimit" resultType="com.fuint.business.integral.entity.IntegralGiftCategory">
select
igc.id, igc.category_name, igc.sort, igc.status, igc.store_id, igc.create_time, igc.update_time, igc.create_by, igc.update_by,ta.real_name as createBy
igc.id, igc.category_name, igc.sort, igc.status, igc.store_id, igc.create_time, igc.update_time, igc.create_by, igc.update_by,ta.real_name as createByName
from integral_gift_category igc
left join mt_staff ta on igc.create_by=ta.id
<where>