Merge branch 'master' of http://192.168.31.244:3000/byx/oilSystem
# 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
commit
93161691a6
@ -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/'
|
||||
|
||||
@ -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
BIN
fuintAdmin_zt/src/assets/images/danxuan_c.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 387 B |
BIN
fuintAdmin_zt/src/assets/images/danxuan_h.png
Normal file
BIN
fuintAdmin_zt/src/assets/images/danxuan_h.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 394 B |
@ -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,7 +109,6 @@ export default {
|
||||
done();
|
||||
})
|
||||
.catch(_ => {});
|
||||
}
|
||||
},
|
||||
prsswrod(){
|
||||
console.log('方法')
|
||||
@ -148,6 +129,7 @@ export default {
|
||||
})
|
||||
}).catch(() => {});
|
||||
}
|
||||
},
|
||||
|
||||
}
|
||||
</script>
|
||||
|
||||
@ -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 >-->
|
||||
|
||||
@ -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', // 已发生交易流量
|
||||
|
||||
@ -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>
|
||||
|
||||
@ -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">
|
||||
|
||||
@ -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: ''
|
||||
}
|
||||
},
|
||||
|
||||
/** 修改按钮操作 */
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -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'},
|
||||
],
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
@ -1,16 +1,19 @@
|
||||
<template>
|
||||
<div class="app-containers">
|
||||
<div class="bai-box" style="margin-top: 20px" >
|
||||
<div class="bai-box" style="margin-top: 20px">
|
||||
<div class="top-box">
|
||||
<div class="d-s">
|
||||
<el-input v-model="input" placeholder="请输入内容" style="width: 240px;margin-right: 15px"></el-input>
|
||||
<el-select v-model="value" placeholder="请选择状态">
|
||||
<el-input v-model="queryParams.realName" placeholder="请输入用户姓名"
|
||||
style="width: 240px;margin-right: 15px"></el-input>
|
||||
<el-input v-model="queryParams.mobile" placeholder="请输入登录账号"
|
||||
style="width: 240px;margin-right: 15px"></el-input>
|
||||
<el-select v-model="queryParams.status" placeholder="请选择状态">
|
||||
<el-option
|
||||
v-for="item in options"
|
||||
:key="item.value"
|
||||
:label="item.label"
|
||||
:value="item.value">
|
||||
</el-option>
|
||||
v-for="dict in dict.type.zhzt"
|
||||
:key="dict.value"
|
||||
:label="dict.label"
|
||||
:value="dict.value"
|
||||
/>
|
||||
</el-select>
|
||||
</div>
|
||||
<div>
|
||||
@ -18,35 +21,39 @@
|
||||
type="primary"
|
||||
icon="el-icon-search"
|
||||
@click="handleQuery"
|
||||
>搜索</el-button>
|
||||
>搜索
|
||||
</el-button>
|
||||
<el-button
|
||||
icon="el-icon-refresh-right"
|
||||
@click="resetQuery"
|
||||
>重置</el-button>
|
||||
>重置
|
||||
</el-button>
|
||||
<el-button
|
||||
type="primary"
|
||||
icon="el-icon-plus"
|
||||
@click="handleAdd"
|
||||
>新增员工</el-button>
|
||||
>新增员工
|
||||
</el-button>
|
||||
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
<el-table ref="tables" border v-loading="loading" :data="list" @selection-change="handleSelectionChange" :default-sort="defaultSort" @sort-change="handleSortChange">
|
||||
<el-table ref="tables" border v-loading="loading" :data="list" @selection-change="handleSelectionChange"
|
||||
:default-sort="defaultSort" @sort-change="handleSortChange">
|
||||
<el-table-column
|
||||
type="index"
|
||||
align="center"
|
||||
label="序号"
|
||||
width="50">
|
||||
</el-table-column>
|
||||
<el-table-column label="用户姓名" width="140" align="center" prop="realName" />
|
||||
<el-table-column label="用户角色" width="140" align="center" prop="dutyName" >
|
||||
<el-table-column label="用户姓名" width="140" align="center" prop="realName"/>
|
||||
<el-table-column label="用户角色" width="140" align="center" prop="dutyName">
|
||||
<template slot-scope="scope">
|
||||
<span>{{scope.row.dutyName || "--"}}</span>
|
||||
<span>{{ scope.row.dutyName || "--" }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="登录账号" align="center" prop="mobile" />
|
||||
<el-table-column label="登录账号" align="center" prop="accountName"/>
|
||||
<el-table-column label="员工状态" align="center" width="80" prop="status">
|
||||
<template slot-scope="scope">
|
||||
<el-switch
|
||||
@ -64,12 +71,12 @@
|
||||
<dict-tag :options="dict.type.display" :value="scope.row.isRefuel"/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<!-- <el-table-column label="收款通知" align="center" prop="notice">-->
|
||||
<!-- <template slot-scope="scope">-->
|
||||
<!-- <dict-tag :options="dict.type.notice" :value="scope.row.notice"/>-->
|
||||
<!-- </template>-->
|
||||
<!-- </el-table-column>-->
|
||||
<el-table-column label="创建时间" align="center" prop="createTime" >
|
||||
<!-- <el-table-column label="收款通知" align="center" prop="notice">-->
|
||||
<!-- <template slot-scope="scope">-->
|
||||
<!-- <dict-tag :options="dict.type.notice" :value="scope.row.notice"/>-->
|
||||
<!-- </template>-->
|
||||
<!-- </el-table-column>-->
|
||||
<el-table-column label="创建时间" align="center" prop="createTime">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ parseTime(scope.row.createTime) }}</span>
|
||||
</template>
|
||||
@ -82,13 +89,15 @@
|
||||
type="text"
|
||||
icon="el-icon-edit"
|
||||
@click="handleUpdate(scope.row)"
|
||||
>修改</el-button>
|
||||
>修改
|
||||
</el-button>
|
||||
<el-button
|
||||
size="mini"
|
||||
type="text"
|
||||
icon="el-icon-delete"
|
||||
@click="handleDelete(scope.row)"
|
||||
>删除</el-button>
|
||||
>删除
|
||||
</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
@ -106,16 +115,35 @@
|
||||
<el-dialog :title="title" :visible.sync="open" width="30%" append-to-body>
|
||||
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
|
||||
|
||||
<el-form-item label="姓名" prop="realName">
|
||||
<el-form-item label="所属机构" prop="storeId">
|
||||
<el-select v-model="form.storeId+''" placeholder="请选择角色" style="width: 270px">
|
||||
<el-option
|
||||
v-for="item in options"
|
||||
:key="item.id+''"
|
||||
:label="item.name"
|
||||
:value="item.id+''"
|
||||
></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="员工姓名" prop="realName">
|
||||
<el-input v-model="form.realName" placeholder="请输入姓名" maxlength="30" style="width: 270px"/>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="手机号" prop="mobile">
|
||||
<el-form-item label="联系方式" prop="mobile">
|
||||
<el-input v-model="form.mobile" placeholder="请输入联系人电话" maxlength="30" style="width: 270px"/>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="登录账号" prop="accountName">
|
||||
<el-input v-model="form.accountName" placeholder="请输入登录账号" maxlength="30" style="width: 270px"/>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="角色组" prop="roleId">
|
||||
<el-form-item label="登录密码" prop="password" v-if="!form.id">
|
||||
<el-input v-model="form.password" placeholder="请输入登录密码" type="password" maxlength="30" style="width: 270px"/>
|
||||
</el-form-item>
|
||||
|
||||
|
||||
<el-form-item label="用户角色" prop="roleId">
|
||||
<el-select v-model="form.roleId" placeholder="请选择角色" style="width: 270px">
|
||||
<el-option
|
||||
v-for="item in roleList"
|
||||
@ -127,71 +155,52 @@
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="账号状态" prop="status">
|
||||
<el-select v-model="form.status"style="width: 270px">
|
||||
<el-option
|
||||
v-for="dict in dict.type.zhzt"
|
||||
:key="dict.value"
|
||||
:label="dict.label"
|
||||
:value="dict.value"
|
||||
/>
|
||||
</el-select>
|
||||
<br/>
|
||||
<el-tooltip
|
||||
class="item"
|
||||
effect="dark"
|
||||
placement="bottom">
|
||||
<div slot="content"> 状态禁用后,当前账号则无法进行<br/>登录和操作</div>
|
||||
<span>状态禁用后,当前账号则无法进行登...</span>
|
||||
</el-tooltip>
|
||||
<el-switch
|
||||
v-model="form.status"
|
||||
active-value="qy"
|
||||
inactive-value="jy"
|
||||
active-color="#13ce66"
|
||||
inactive-color="#ff4949">
|
||||
</el-switch>
|
||||
</el-form-item>
|
||||
|
||||
|
||||
<el-form-item label="一键加油" prop="isRefuel">
|
||||
<el-select v-model="form.isRefuel" style="width: 270px">
|
||||
<el-option
|
||||
v-for="dict in dict.type.display"
|
||||
:key="dict.value"
|
||||
:label="dict.label"
|
||||
:value="dict.value"
|
||||
/>
|
||||
</el-select>
|
||||
<br/>
|
||||
<el-tooltip
|
||||
class="item"
|
||||
effect="dark"
|
||||
placement="bottom">
|
||||
<div slot="content">加油时选择加油员场景使用,选择不显示加油员将无法被指定<br/>(需系统开启加油选择加油员功能)终端支持:(PC、POS、小程序)</div>
|
||||
<span>加油时选择加油员场景使用,选择...</span>
|
||||
</el-tooltip>
|
||||
</el-form-item>
|
||||
<!-- <el-select v-model="form.isRefuel" style="width: 270px">-->
|
||||
<!-- <el-option-->
|
||||
<!-- v-for="dict in dict.type.display"-->
|
||||
<!-- :key="dict.value"-->
|
||||
<!-- :label="dict.label"-->
|
||||
<!-- :value="dict.value"-->
|
||||
<!-- />-->
|
||||
<!-- </el-select>-->
|
||||
<div style="display: flex;" v-if="form.isRefuel=='xs'" @click="form.isRefuel='yc'">
|
||||
<div>
|
||||
<img src="@/assets/images/danxuan_c.png"/>
|
||||
<span class="text_49">显示</span>
|
||||
</div>
|
||||
<div style="margin-left: 15px">
|
||||
<img src="@/assets/images/danxuan_h.png"/>
|
||||
<span class="text_50">隐藏</span>
|
||||
</div>
|
||||
</div>
|
||||
<div style="display: flex;" v-else @click="form.isRefuel='xs'">
|
||||
<div>
|
||||
<img src="@/assets/images/danxuan_h.png"/>
|
||||
<span class="text_50">显示</span>
|
||||
</div>
|
||||
<div style="margin-left: 15px">
|
||||
<img src="@/assets/images/danxuan_c.png"/>
|
||||
<span class="text_49">隐藏</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<el-form-item label="收款通知" prop="notice">
|
||||
<el-select v-model="form.notice" style="width: 270px">
|
||||
<el-option
|
||||
v-for="dict in dict.type.notice"
|
||||
:key="dict.value"
|
||||
:label="dict.label"
|
||||
:value="dict.value"
|
||||
/>
|
||||
</el-select>
|
||||
<br/>
|
||||
<el-tooltip
|
||||
class="item"
|
||||
effect="dark"
|
||||
placement="bottom">
|
||||
<div slot="content"> 收款成功接收的公众号模板消息通知,需<br/>关注公众号,且本站小程序中会员手机号<br/>信息与当前员工手机号一致 </div>
|
||||
<span>收款成功接收的公众号模板消息...</span>
|
||||
</el-tooltip>
|
||||
<span class="text_51" >* 若用户的一键加油设置为隐藏，则收银台无法选择该员工</span>
|
||||
</el-form-item>
|
||||
|
||||
|
||||
|
||||
<!-- </el-row>-->
|
||||
<!-- <el-row>-->
|
||||
|
||||
<el-form-item label="备注信息">
|
||||
<el-input style="width: 270px" v-model="form.description" type="textarea" placeholder="请输入内容"></el-input>
|
||||
</el-form-item>
|
||||
<!-- </el-row>-->
|
||||
<!-- <el-row>-->
|
||||
|
||||
|
||||
</el-form>
|
||||
@ -204,16 +213,17 @@
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import {getName} from "../../../utils/fuint";
|
||||
import {addStaff, delStaff, getStaff, listStaff, updateStaff} from "../../../api/staff/staff";
|
||||
import {dutyList} from "@/api/duty/duty";
|
||||
// import {getDuty, listDuty} from "@/api/staff/duty";
|
||||
import {getName} from "../../../utils/fuint";
|
||||
import {addStaff, delStaff, getStaff, listStaff, updateStaff} from "../../../api/staff/staff";
|
||||
import {dutyList} from "@/api/duty/duty";
|
||||
import {getStoreListByDeptId} from "../../../api/store";
|
||||
// import {getDuty, listDuty} from "@/api/staff/duty";
|
||||
|
||||
export default {
|
||||
export default {
|
||||
name: "StaffList",
|
||||
dicts: ['ywqx','write_off','display','zhzt','transaction','time_frame','handover','handover_quit',
|
||||
'jbjl','official','notice','special_prem','role'],
|
||||
props: ["id"],
|
||||
dicts: ['ywqx', 'display', 'zhzt', 'transaction', 'time_frame', 'handover', 'handover_quit',
|
||||
'jbjl', 'special_prem'],
|
||||
props: ["id", 'deptId'],
|
||||
|
||||
data() {
|
||||
return {
|
||||
@ -249,27 +259,27 @@
|
||||
categoryOptions: [],
|
||||
storeOptions: [],
|
||||
// role:[],
|
||||
posPrem:'',
|
||||
posOptions:[
|
||||
{value: '首页权限',label: '首页权限',children:[{value: '禁用普通收款权限', label: '禁用普通收款权限' },]},
|
||||
{value: '会员储值',label: '会员储值'},
|
||||
{value: '会员实体卡',label: '会员实体卡'},
|
||||
{value: '会员积分',label: '会员积分'},
|
||||
{value: '加油金变动',label: '加油金变动'},
|
||||
{value: '会员卡券',label: '会员卡券'},
|
||||
{value: '会员成长值',label: '会员成长值'},
|
||||
posPrem: '',
|
||||
posOptions: [
|
||||
{value: '首页权限', label: '首页权限', children: [{value: '禁用普通收款权限', label: '禁用普通收款权限'},]},
|
||||
{value: '会员储值', label: '会员储值'},
|
||||
{value: '会员实体卡', label: '会员实体卡'},
|
||||
{value: '会员积分', label: '会员积分'},
|
||||
{value: '加油金变动', label: '加油金变动'},
|
||||
{value: '会员卡券', label: '会员卡券'},
|
||||
{value: '会员成长值', label: '会员成长值'},
|
||||
],
|
||||
props: { multiple: true },
|
||||
appletPrem:'',
|
||||
appletOptions:[
|
||||
{value: '首页权限',label: '首页权限',children:[{value: '女装', label: '女装' },]},
|
||||
{value: '会员储值',label: '会员储值'},
|
||||
{value: '会员实体卡',label: '会员实体卡'},
|
||||
props: {multiple: true},
|
||||
appletPrem: '',
|
||||
appletOptions: [
|
||||
{value: '首页权限', label: '首页权限', children: [{value: '女装', label: '女装'},]},
|
||||
{value: '会员储值', label: '会员储值'},
|
||||
{value: '会员实体卡', label: '会员实体卡'},
|
||||
],
|
||||
writeOff:[],
|
||||
write:[],
|
||||
specialPrem:[],
|
||||
special:[],
|
||||
writeOff: [],
|
||||
write: [],
|
||||
specialPrem: [],
|
||||
special: [],
|
||||
// 总条数
|
||||
total: 0,
|
||||
// 表格数据
|
||||
@ -281,13 +291,40 @@
|
||||
// 默认排序
|
||||
defaultSort: {prop: 'createTime', order: 'descending'},
|
||||
// 角色列表
|
||||
roleList:[],
|
||||
roleList: [],
|
||||
// 表单参数
|
||||
form: {
|
||||
id:'', category:'', userId:'', mobile:'', realName:'', wechat:'', merchantId:'', storeId:this.id, auditedStatus:'',
|
||||
auditedTime:'', description:'', isRefuel:'yc', handoverMode:'dqmdtyjb', handoverPrem:'yqx', handoverOut:'jbtc', record:'qbjl',
|
||||
merchantStatus:'qy',screen:'qy', posPrem:'', appletPrem:'', notice:'advice_jy', oilGunId:'', timeFrame:'bx', refund:'yqx',
|
||||
transaction:'qbjy', writeOff:'',specialPrem:'', official:'', status:'qy',pos:'jy',role:''
|
||||
id: '',
|
||||
category: '',
|
||||
userId: '',
|
||||
mobile: '',
|
||||
realName: '',
|
||||
wechat: '',
|
||||
merchantId: '',
|
||||
storeId: this.id,
|
||||
auditedStatus: '',
|
||||
auditedTime: '',
|
||||
description: '',
|
||||
isRefuel: 'yc',
|
||||
handoverMode: 'dqmdtyjb',
|
||||
handoverPrem: 'yqx',
|
||||
handoverOut: 'jbtc',
|
||||
record: 'qbjl',
|
||||
merchantStatus: 'qy',
|
||||
screen: 'qy',
|
||||
posPrem: '',
|
||||
appletPrem: '',
|
||||
notice: 'advice_jy',
|
||||
oilGunId: '',
|
||||
timeFrame: 'bx',
|
||||
refund: 'yqx',
|
||||
transaction: 'qbjy',
|
||||
writeOff: '',
|
||||
specialPrem: '',
|
||||
official: '',
|
||||
status: 'qy',
|
||||
pos: 'jy',
|
||||
role: ''
|
||||
},
|
||||
// 查询参数
|
||||
queryParams: {
|
||||
@ -300,51 +337,57 @@
|
||||
// 表单校验
|
||||
rules: {
|
||||
realName: [
|
||||
{ required: true, message: "姓名不能为空", trigger: "blur" },
|
||||
{ min: 2, max: 30, message: '姓名长度必须介于 2 和 20 之间', trigger: 'blur' }
|
||||
{required: true, message: "姓名不能为空", trigger: "blur"},
|
||||
{min: 2, max: 30, message: '姓名长度必须介于 2 和 20 之间', trigger: 'blur'}
|
||||
],
|
||||
mobile: [
|
||||
{ required: true, message: "手机号不能为空", trigger: "blur" },
|
||||
{ min: 11, max: 20, message: '手机号长度必须11', trigger: 'blur' }
|
||||
{required: true, message: "手机号不能为空", trigger: "blur"},
|
||||
{min: 11, max: 20, message: '手机号长度必须11', trigger: 'blur'}
|
||||
],
|
||||
accountName: [
|
||||
{required: true, message: "请填写登录账号", trigger: "blur"}
|
||||
],
|
||||
password: [
|
||||
{required: true, message: "请填写登录密码", trigger: "blur"}
|
||||
],
|
||||
roleId: [
|
||||
{ required: true, message: "请选择员工角色", trigger: "blur" }
|
||||
{required: true, message: "请选择员工角色", trigger: "blur"}
|
||||
],
|
||||
isRefuel: [
|
||||
{ required: true, message: "请选择加油状态", trigger: "blur" }
|
||||
{required: true, message: "请选择加油状态", trigger: "blur"}
|
||||
],
|
||||
pos: [
|
||||
{ required: true, message: "请选择员状态", trigger: "blur" }
|
||||
{required: true, message: "请选择员状态", trigger: "blur"}
|
||||
],
|
||||
transaction: [
|
||||
{ required: true, message: "请选择", trigger: "blur" }
|
||||
{required: true, message: "请选择", trigger: "blur"}
|
||||
],
|
||||
notice: [
|
||||
{ required: true, message: "请选择", trigger: "blur" }
|
||||
{required: true, message: "请选择", trigger: "blur"}
|
||||
],
|
||||
timeFrame: [
|
||||
{ required: true, message: "请选择", trigger: "blur" }
|
||||
{required: true, message: "请选择", trigger: "blur"}
|
||||
],
|
||||
handoverMode: [
|
||||
{ required: true, message: "请选择", trigger: "blur" }
|
||||
{required: true, message: "请选择", trigger: "blur"}
|
||||
],
|
||||
handoverPrem: [
|
||||
{ required: true, message: "请选择", trigger: "blur" }
|
||||
{required: true, message: "请选择", trigger: "blur"}
|
||||
],
|
||||
handoverOut: [
|
||||
{ required: true, message: "请选择", trigger: "blur" }
|
||||
{required: true, message: "请选择", trigger: "blur"}
|
||||
],
|
||||
record: [
|
||||
{ required: true, message: "请选择", trigger: "blur" }
|
||||
{required: true, message: "请选择", trigger: "blur"}
|
||||
],
|
||||
merchantStatus: [
|
||||
{ required: true, message: "请选择", trigger: "blur" }
|
||||
{required: true, message: "请选择", trigger: "blur"}
|
||||
],
|
||||
screen: [
|
||||
{ required: true, message: "请选择", trigger: "blur" }
|
||||
{required: true, message: "请选择", trigger: "blur"}
|
||||
],
|
||||
status: [
|
||||
{ required: true, message: "请选择", trigger: "blur" }
|
||||
{required: true, message: "请选择", trigger: "blur"}
|
||||
]
|
||||
}
|
||||
};
|
||||
@ -352,10 +395,10 @@
|
||||
created() {
|
||||
this.getList();
|
||||
// this.getDuty();
|
||||
// this.getStoreList();
|
||||
this.getStoreList();
|
||||
},
|
||||
methods: {
|
||||
showDesc(){
|
||||
showDesc() {
|
||||
this.drawer = true;
|
||||
},
|
||||
handleNodeClick1(data) {
|
||||
@ -364,13 +407,13 @@
|
||||
handleNodeClick2(data) {
|
||||
this.form.appletPrem = JSON.stringify(data);
|
||||
},
|
||||
getCheckbox(){
|
||||
getCheckbox() {
|
||||
this.form.writeOff = this.writeOff.toString();
|
||||
this.form.specialPrem = this.specialPrem.toString();
|
||||
},
|
||||
// 页面跳转
|
||||
toTarget(url) {
|
||||
this.$router.push( { path: url } );
|
||||
this.$router.push({path: url});
|
||||
},
|
||||
getName,
|
||||
// 查询列表
|
||||
@ -396,21 +439,21 @@
|
||||
// );
|
||||
},
|
||||
// 查询角色列表
|
||||
getDuty(){
|
||||
getDuty() {
|
||||
listDuty().then(response => {
|
||||
this.role = response.data
|
||||
})
|
||||
},
|
||||
// 店铺列表
|
||||
getStoreList() {
|
||||
listStaff().then(response => {
|
||||
this.storeOptions = response.data.records;
|
||||
}
|
||||
);
|
||||
// searchStore().then(response => {
|
||||
// this.storeOptions = response.data.storeList;
|
||||
// listStaff().then(response => {
|
||||
// this.storeOptions = response.data.records;
|
||||
// }
|
||||
// );
|
||||
getStoreListByDeptId(this.deptId).then(response => {
|
||||
this.options = response.data;
|
||||
}
|
||||
);
|
||||
},
|
||||
// 搜索按钮操作
|
||||
handleQuery() {
|
||||
@ -422,17 +465,24 @@
|
||||
this.dateRange = [];
|
||||
this.resetForm("queryForm");
|
||||
this.$refs.tables.sort(this.defaultSort.prop, this.defaultSort.order)
|
||||
this.queryParams = {
|
||||
page: 1,
|
||||
pageSize: 10,
|
||||
realName: '',
|
||||
mobile: '',
|
||||
status: ''
|
||||
}
|
||||
this.handleQuery();
|
||||
},
|
||||
// 状态修改
|
||||
handleStatusChange(row) {
|
||||
let text = row.auditedStatus == "A" ? "启用" : "禁用";
|
||||
this.$modal.confirm('确认要' + text + '"' + row.realName + '"吗？').then(function() {
|
||||
this.$modal.confirm('确认要' + text + '"' + row.realName + '"吗？').then(function () {
|
||||
// return updateStaffStatus(row.id, row.auditedStatus);
|
||||
return updateStaff({id:row.id, auditedStatus:row.auditedStatus})
|
||||
return updateStaff({id: row.id, auditedStatus: row.auditedStatus})
|
||||
}).then(() => {
|
||||
this.$modal.msgSuccess(text + "成功");
|
||||
}).catch(function() {
|
||||
}).catch(function () {
|
||||
row.auditedStatus = row.auditedStatus === "A" ? "A" : "N";
|
||||
});
|
||||
},
|
||||
@ -457,9 +507,9 @@
|
||||
// 获取角色信息
|
||||
getRoleList1() {
|
||||
let data = {
|
||||
page:1,
|
||||
pageSize:10000,
|
||||
dutyType:3
|
||||
page: 1,
|
||||
pageSize: 10000,
|
||||
dutyType: 3
|
||||
}
|
||||
dutyList(data).then(res => {
|
||||
this.roleList = res.data.records
|
||||
@ -471,10 +521,37 @@
|
||||
this.appletPrem = '';
|
||||
this.writeOff = []
|
||||
this.form = {
|
||||
id:'', category:'', userId:'', mobile:'', realName:'', wechat:'', merchantId:'', storeId:this.id, auditedStatus:'A',
|
||||
auditedTime:'', description:'', isRefuel:'yc', handoverMode:'dqmdtyjb', handoverPrem:'yqx', handoverOut:'jbtc', record:'qbjl',
|
||||
merchantStatus:'qy',screen:'qy', posPrem:'', appletPrem:'', notice:'advice_jy', oilGunId:'', timeFrame:'bx', refund:'yqx',
|
||||
transaction:'qbjy', writeOff:'',specialPrem:'', official:'', status:'qy',pos:'jy',role:''
|
||||
id: '',
|
||||
category: '',
|
||||
userId: '',
|
||||
mobile: '',
|
||||
realName: '',
|
||||
wechat: '',
|
||||
merchantId: '',
|
||||
storeId: this.id,
|
||||
auditedStatus: 'A',
|
||||
auditedTime: '',
|
||||
description: '',
|
||||
isRefuel: 'xs',
|
||||
handoverMode: 'dqmdtyjb',
|
||||
handoverPrem: 'yqx',
|
||||
handoverOut: 'jbtc',
|
||||
record: 'qbjl',
|
||||
merchantStatus: 'qy',
|
||||
screen: 'qy',
|
||||
posPrem: '',
|
||||
appletPrem: '',
|
||||
notice: 'advice_jy',
|
||||
oilGunId: '',
|
||||
timeFrame: 'bx',
|
||||
refund: 'yqx',
|
||||
transaction: 'qbjy',
|
||||
writeOff: '',
|
||||
specialPrem: '',
|
||||
official: '',
|
||||
status: 'qy',
|
||||
pos: 'jy',
|
||||
role: ''
|
||||
};
|
||||
this.resetForm("form");
|
||||
},
|
||||
@ -484,7 +561,7 @@
|
||||
this.reset();
|
||||
},
|
||||
// 提交按钮
|
||||
submitForm: function() {
|
||||
submitForm: function () {
|
||||
this.$refs["form"].validate(valid => {
|
||||
if (valid) {
|
||||
this.form.storeId = this.id;
|
||||
@ -526,50 +603,106 @@
|
||||
// 删除按钮操作
|
||||
handleDelete(row) {
|
||||
const name = row.realName || this.id;
|
||||
this.$modal.confirm('是否确认删除"' + name + '"的数据项？').then(function() {
|
||||
this.$modal.confirm('是否确认删除"' + name + '"的数据项？').then(function () {
|
||||
return delStaff(row.id);
|
||||
}).then(() => {
|
||||
this.getList();
|
||||
this.$modal.msgSuccess("删除成功");
|
||||
}).catch(() => {});
|
||||
}).catch(() => {
|
||||
});
|
||||
}
|
||||
}
|
||||
};
|
||||
};
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
.app-containers{
|
||||
.app-containers {
|
||||
width: 98%;
|
||||
height: 100%;
|
||||
/* height: 100vh; */
|
||||
background: #f9f9f9;
|
||||
margin: 20px auto;
|
||||
}
|
||||
.bai-box{
|
||||
}
|
||||
|
||||
.bai-box {
|
||||
background: #fff;
|
||||
box-sizing: border-box;
|
||||
padding: 20px;
|
||||
}
|
||||
.pagin-box{
|
||||
}
|
||||
|
||||
.pagin-box {
|
||||
background: white;
|
||||
box-sizing: border-box;
|
||||
padding: 20px;
|
||||
}
|
||||
.baoguo{
|
||||
}
|
||||
|
||||
.baoguo {
|
||||
background: white;
|
||||
box-sizing: border-box;
|
||||
padding: 20px;
|
||||
margin-bottom: 20px;
|
||||
}
|
||||
.top-box{
|
||||
}
|
||||
|
||||
.top-box {
|
||||
width: 100%;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
margin-bottom: 15px;
|
||||
}
|
||||
.d-s{
|
||||
}
|
||||
|
||||
.d-s {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
}
|
||||
}
|
||||
|
||||
.thumbnail_8 {
|
||||
width: 20px;
|
||||
height: 20px;
|
||||
margin-left: 10px;
|
||||
}
|
||||
|
||||
.text_49 {
|
||||
width: 24px;
|
||||
height: 12px;
|
||||
overflow-wrap: break-word;
|
||||
color: rgba(255, 150, 85, 1);
|
||||
font-size: 12px;
|
||||
font-weight: normal;
|
||||
text-align: left;
|
||||
white-space: nowrap;
|
||||
line-height: 18px;
|
||||
margin-top: 3px;
|
||||
}
|
||||
|
||||
.thumbnail_9 {
|
||||
width: 20px;
|
||||
height: 20px;
|
||||
margin-left: 20px;
|
||||
}
|
||||
|
||||
.text_50 {
|
||||
width: 24px;
|
||||
height: 12px;
|
||||
overflow-wrap: break-word;
|
||||
color: rgba(153, 153, 153, 1);
|
||||
font-size: 12px;
|
||||
font-weight: normal;
|
||||
text-align: left;
|
||||
white-space: nowrap;
|
||||
line-height: 18px;
|
||||
margin-top: 3px;
|
||||
}
|
||||
|
||||
.text_51 {
|
||||
width: 257px;
|
||||
height: 10px;
|
||||
overflow-wrap: break-word;
|
||||
color: rgba(153, 153, 153, 1);
|
||||
font-size: 10px;
|
||||
font-weight: normal;
|
||||
text-align: right;
|
||||
white-space: nowrap;
|
||||
line-height: 15px;
|
||||
}
|
||||
</style>
|
||||
|
||||
@ -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>
|
||||
|
||||
@ -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>
|
||||
|
||||
@ -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>
|
||||
|
||||
@ -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>
|
||||
|
||||
@ -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">
|
||||
|
||||
@ -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>
|
||||
|
||||
@ -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>
|
||||
|
||||
@ -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>
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -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 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 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>
|
||||
</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 = []
|
||||
@ -361,35 +359,69 @@ export default {
|
||||
|
||||
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日活跃油站' },
|
||||
|
||||
],
|
||||
emphasis: {
|
||||
radius: ['40%', '80%'],
|
||||
avoidLabelOverlap: false,
|
||||
itemStyle: {
|
||||
shadowBlur: 10,
|
||||
shadowOffsetX: 0,
|
||||
shadowColor: 'rgba(0, 0, 0, 0.5)'
|
||||
}
|
||||
}
|
||||
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: '拉卡拉占比' }
|
||||
],
|
||||
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: {
|
||||
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: '拉卡拉占比' }
|
||||
],
|
||||
label: {
|
||||
show: true,
|
||||
fontSize: 40,
|
||||
fontWeight: 'bold'
|
||||
}
|
||||
position: "inside",
|
||||
color:'#fff',
|
||||
formatter: `{d}%`,
|
||||
},
|
||||
|
||||
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: '拉卡拉占比' }
|
||||
]
|
||||
}
|
||||
]
|
||||
};
|
||||
@ -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;
|
||||
}
|
||||
|
||||
@ -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"
|
||||
<el-form-item label="" prop="orgName">
|
||||
<el-input
|
||||
v-model="queryParams.orgName"
|
||||
placeholder="请输入机构名称"
|
||||
clearable
|
||||
placeholder="所属机构"
|
||||
|
||||
>
|
||||
<el-option v-for="item in deptList" :key="item.deptId" :label="item.deptName" :value="item.deptId">
|
||||
</el-option>
|
||||
</el-select>
|
||||
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>
|
||||
|
||||
<!-- <!– 列表信息–>-->
|
||||
<!-- <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);
|
||||
|
||||
|
||||
@ -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="图片">
|
||||
|
||||
@ -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>
|
||||
|
||||
@ -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>-->
|
||||
<!-->>>>>>> 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>
|
||||
|
||||
@ -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());
|
||||
}
|
||||
|
||||
@ -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;
|
||||
}
|
||||
|
||||
@ -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);
|
||||
}
|
||||
|
||||
@ -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>
|
||||
|
||||
@ -47,7 +47,7 @@ public interface ILJStaffService extends IService<LJStaff> {
|
||||
* @param id
|
||||
* @return
|
||||
*/
|
||||
public LJStaff selectStaffById(int id);
|
||||
public LJStaff selectStaffById(Integer id);
|
||||
|
||||
/**
|
||||
* 根据手机号查询员工信息
|
||||
|
||||
@ -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);
|
||||
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());
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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));
|
||||
}
|
||||
}
|
||||
|
||||
@ -137,4 +137,6 @@ public interface StoreService extends IService<MtStore> {
|
||||
* @return
|
||||
*/
|
||||
List<StoreNumVo> getStoreAmountByTime(MtStore store);
|
||||
|
||||
List<MtStore> getStoreByDeptId(Integer deptId);
|
||||
}
|
||||
|
||||
@ -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();
|
||||
|
||||
@ -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()
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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/'
|
||||
|
||||
Loading…
Reference in New Issue
Block a user