bonus
/
bonus-ui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

自测问题修改

This commit is contained in:
zzyuan 2025-04-18 10:57:17 +08:00
parent 6494270c0a
commit 2afc1e9de9
11 changed files with 105 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/api/accountCenter/manager.js
View File

@ -90,7 +90,7 @@ export function rechargeAccWalletApi(data) {
// 账户管理-个人钱包-离职时，清空金额
export function clearAccWalletApi(data) {
return request({
url: '/smart-canteen/acc_info/acc/leave/clear',
url: '/smart-canteen/acc_info/leave/clear',
method: 'post',
headers: {
"merchant-id":"378915229716713472",

14
src/views/accountCenter/account/accountManager/index.vue
View File

@ -79,7 +79,17 @@
<el-table-column label="用户姓名" align="center" prop="nickName" :show-overflow-tooltip="true" width="120" fixed="left"/>
<el-table-column label="用户手机号" align="center" prop="phoneNumber" :show-overflow-tooltip="true" width="120"/>
<el-table-column label="所属组织" align="center" prop="deptName" :show-overflow-tooltip="true" width="120"/>
<el-table-column label="用户类别" align="center" prop="userTypeName" :show-overflow-tooltip="true" width="120"/>
<el-table-column label="用户类别" align="center" prop="userType" :show-overflow-tooltip="true" width="120">
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_user_type" :value="scope.row.userType"/>
</template>
</el-table-column>
<el-table-column label="账户状态" align="center" prop="accStatus" :show-overflow-tooltip="true" width="120">
<template slot-scope="scope">
<span v-if="scope.row.accStatus==0">正常</span>
<span v-if="scope.row.accStatus==1">停用</span>
</template>
</el-table-column>
<el-table-column label="账户总余额" align="center" prop="accBalTotal" :show-overflow-tooltip="true" width="120">
<template slot-scope="scope">
<span>{{ (scope.row.accBalTotal/100).toFixed(2) }}</span>
@ -120,7 +130,7 @@
<span>{{ (scope.row.minSubBalLimit/100).toFixed(2) }}</span>
</template>
</el-table-column>
<el-table-column label="账户状态" align="center" prop="accStatusName" :show-overflow-tooltip="true" width="120"/>
<!-- <el-table-column label="账户有效期" align="center" prop="endDate" :show-overflow-tooltip="true" width="150"/> -->

9
src/views/accountCenter/account/tradeRecords/index.vue
View File

@ -80,9 +80,14 @@
<el-table-column label="用户编号" align="center" prop="userId" :show-overflow-tooltip="true" />
<el-table-column label="用户姓名" align="center" prop="userName" :show-overflow-tooltip="true" />
<el-table-column label="用户手机号" align="center" prop="phone" :show-overflow-tooltip="true" />
<el-table-column label="所属组织" align="center" prop="deptFullName" :show-overflow-tooltip="true" />
<el-table-column label="所属组织" align="center" prop="deptName" :show-overflow-tooltip="true" />
<el-table-column label="操作员" align="center" prop="createBy" :show-overflow-tooltip="true" />
<el-table-column label="操作员事件" align="center" prop="typeName" :show-overflow-tooltip="true" />
<el-table-column label="操作员事件" align="center" prop="type" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span v-if="scope.row.type==0">启用</span>
<span v-if="scope.row.type==1">停用</span>
</template>
</el-table-column>
<el-table-column label="操作时间" align="center" prop="createTime" :show-overflow-tooltip="true" />
<!-- <el-table-column label="操作" align="center" width="180" class-name="small-padding fixed-width" fixed="right">
<template slot-scope="scope">

28
src/views/accountCenter/account/wallet/index.vue
View File

@ -49,29 +49,39 @@
<el-table-column label="用户编号" align="center" prop="userId" :show-overflow-tooltip="true" width="120" fixed="left"/>
<el-table-column label="用户姓名" align="center" prop="nickName" :show-overflow-tooltip="true" width="120" fixed="left"/>
<el-table-column label="用户手机号" align="center" prop="phoneNumber" :show-overflow-tooltip="true" width="120"/>
<el-table-column label="所属组织" align="center" prop="deptName" :show-overflow-tooltip="true" width="120"/>
<el-table-column label="用户类别" align="center" prop="userTypeName" :show-overflow-tooltip="true" width="120"/>
<el-table-column label="账户总余额" align="center" prop="accBalTotal" :show-overflow-tooltip="true" width="120">
<el-table-column label="所属组织" align="center" prop="deptName" :show-overflow-tooltip="true"/>
<el-table-column label="用户类别" align="center" prop="userType" :show-overflow-tooltip="true" width="120">
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_user_type" :value="scope.row.userType"/>
</template>
</el-table-column>
<el-table-column label="账户状态" align="center" prop="accStatus" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span v-if="scope.row.accStatus==0">正常</span>
<span v-if="scope.row.accStatus==1">停用</span>
</template>
</el-table-column>
<el-table-column label="账户总余额" align="center" prop="accBalTotal" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span>{{ (scope.row.accBalTotal/100).toFixed(2) }}</span>
</template>
</el-table-column>
<!-- <el-table-column label="可用总余额" align="center" prop="accAvailableBal" :show-overflow-tooltip="true" width="120">
<!-- <el-table-column label="可用总余额" align="center" prop="accAvailableBal" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span>{{ (scope.row.accAvailableBal/100).toFixed(2) }}</span>
</template>
</el-table-column> -->
<el-table-column label="个人钱包余额" align="center" prop="walletBal" :show-overflow-tooltip="true" width="120">
<el-table-column label="个人钱包余额" align="center" prop="walletBal" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span>{{ (scope.row.walletBal/100).toFixed(2) }}</span>
</template>
</el-table-column>
<el-table-column label="补贴钱包余额" align="center" prop="subsidyBal" :show-overflow-tooltip="true" width="120">
<el-table-column label="补贴钱包余额" align="center" prop="subsidyBal" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span>{{ (scope.row.subsidyBal/100).toFixed(2) }}</span>
</template>
</el-table-column>
<el-table-column label="冻结金额" align="center" prop="accFreezeBalTotal" :show-overflow-tooltip="true" width="120">
<el-table-column label="冻结金额" align="center" prop="accFreezeBalTotal" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span>{{ (scope.row.accFreezeBalTotal/100).toFixed(2) }}</span>
</template>
@ -86,11 +96,11 @@
<span>{{ (scope.row.minSubBalLimit/100).toFixed(2) }}</span>
</template>
</el-table-column> -->
<el-table-column label="账户状态" align="center" prop="accStatusName" :show-overflow-tooltip="true" width="120"/>
<!-- <el-table-column label="账户有效期" align="center" prop="endDate" :show-overflow-tooltip="true" width="150"/> -->
<el-table-column label="操作" align="center" width="180" class-name="small-padding fixed-width" fixed="right">
<el-table-column label="操作" align="center" width="200" class-name="small-padding fixed-width" fixed="right">
<template slot-scope="scope" v-if="scope.$index!=10">
<el-button
size="mini"

26
src/views/accountCenter/butie/butie/index.vue
View File

@ -47,8 +47,18 @@
<el-table-column label="用户姓名" align="center" prop="nickName" :show-overflow-tooltip="true" width="120" fixed="left"/>
<el-table-column label="用户手机号" align="center" prop="phoneNumber" :show-overflow-tooltip="true" width="120"/>
<el-table-column label="所属组织" align="center" prop="deptName" :show-overflow-tooltip="true" width="120"/>
<el-table-column label="用户类别" align="center" prop="userTypeName" :show-overflow-tooltip="true" width="120"/>
<el-table-column label="账户总余额" align="center" prop="accBalTotal" :show-overflow-tooltip="true" width="120">
<el-table-column label="用户类别" align="center" prop="userType" :show-overflow-tooltip="true" width="120">
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_user_type" :value="scope.row.userType"/>
</template>
</el-table-column>
<el-table-column label="账户状态" align="center" prop="accStatus" :show-overflow-tooltip="true" width="120">
<template slot-scope="scope">
<span v-if="scope.row.accStatus==0">正常</span>
<span v-if="scope.row.accStatus==1">停用</span>
</template>
</el-table-column>
<el-table-column label="账户总余额" align="center" prop="accBalTotal" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span>{{ (scope.row.accBalTotal/100).toFixed(2) }}</span>
</template>
@ -58,29 +68,29 @@
<span>{{ (scope.row.accAvailableBal/100).toFixed(2) }}</span>
</template>
</el-table-column> -->
<el-table-column label="个人钱包余额" align="center" prop="walletBal" :show-overflow-tooltip="true" width="120">
<el-table-column label="个人钱包余额" align="center" prop="walletBal" :show-overflow-tooltip="true" >
<template slot-scope="scope">
<span>{{ (scope.row.walletBal/100).toFixed(2) }}</span>
</template>
</el-table-column>
<el-table-column label="补贴钱包余额" align="center" prop="subsidyBal" :show-overflow-tooltip="true" width="120">
<el-table-column label="补贴钱包余额" align="center" prop="subsidyBal" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span>{{ (scope.row.subsidyBal/100).toFixed(2) }}</span>
</template>
</el-table-column>
<!-- <el-table-column label="红包余额" align="center" prop="redEnvelope" :show-overflow-tooltip="true" width="120">
<!-- <el-table-column label="红包余额" align="center" prop="redEnvelope" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span>{{ (scope.row.redEnvelope/100).toFixed(2) }}</span>
</template>
</el-table-column> -->
<el-table-column label="冻结金额" align="center" prop="accFreezeBalTotal" :show-overflow-tooltip="true" width="120">
<el-table-column label="冻结金额" align="center" prop="accFreezeBalTotal" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span>{{ (scope.row.accFreezeBalTotal/100).toFixed(2) }}</span>
</template>
</el-table-column>
<el-table-column label="账户状态" align="center" prop="accStatusName" :show-overflow-tooltip="true" width="120"/>
<!-- <el-table-column label="账户有效期" align="center" prop="endDate" :show-overflow-tooltip="true" width="150"/> -->
<el-table-column label="操作" align="center" width="180" class-name="small-padding fixed-width" fixed="right">
<el-table-column label="操作" align="center" width="200" class-name="small-padding fixed-width" fixed="right">
<template slot-scope="scope" v-if="scope.$index!=10">
<el-button
size="mini"

14
src/views/accountCenter/butie/butieRecordsTab/index.vue
View File

@ -66,7 +66,12 @@
<el-table-column label="用户姓名" align="center" prop="nickName" :show-overflow-tooltip="true" width="120" />
<el-table-column label="用户手机号" align="center" prop="phoneNumber" :show-overflow-tooltip="true" width="120" />
<el-table-column label="所属组织" align="center" prop="deptName" :show-overflow-tooltip="true"/>
<el-table-column label="用户类别" align="center" prop="userTypeName" :show-overflow-tooltip="true"/>
<!-- <el-table-column label="用户类别" align="center" prop="userTypeName" :show-overflow-tooltip="true"/> -->
<el-table-column label="用户类别" align="center" prop="userType" :show-overflow-tooltip="true" width="120">
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_user_type" :value="scope.row.userType"/>
</template>
</el-table-column>
<el-table-column label="补贴金额" align="center" prop="amount" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span>{{ (scope.row.amount/100).toFixed(2) }}</span>
@ -160,7 +165,12 @@
<el-table-column label="用户姓名" align="center" prop="nickName" :show-overflow-tooltip="true"/>
<el-table-column label="用户手机号" align="center" prop="phoneNumber" :show-overflow-tooltip="true"/>
<el-table-column label="所属组织" align="center" prop="deptName" :show-overflow-tooltip="true"/>
<el-table-column label="用户类别" align="center" prop="userTypeName" :show-overflow-tooltip="true"/>
<!-- <el-table-column label="用户类别" align="center" prop="userTypeName" :show-overflow-tooltip="true"/> -->
<el-table-column label="用户类别" align="center" prop="userType" :show-overflow-tooltip="true" width="120">
<template slot-scope="scope">
<dict-tag :options="dict.type.sys_user_type" :value="scope.row.userType"/>
</template>
</el-table-column>
<el-table-column label="清空金额" align="center" prop="amount" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span>{{ (scope.row.amount/100).toFixed(2) }}</span>

2
src/views/device/doubleScreen/index.vue
View File

@ -464,7 +464,7 @@
"canteenId":this.queryParams.canteenId,
"stallId":this.queryParams.stallId,
"keyWord":this.queryParams.keyWord,
// "deviceType":20
"deviceType":20
}
console.log("param",param)
// let str = base64.encode(JSON.stringify(param))

4
src/views/dish/dish/index.vue
View File

@ -1303,7 +1303,7 @@
},
/** 查询列表 */
getList() {
console.log(this.$refs.typeTree.getCheckedKeys())
// console.log(this.$refs.typeTree.getCheckedKeys())
this.loading = true;
let params= {
"pageSize": this.queryParams.pageSize,
@ -1312,7 +1312,7 @@
"canteenId": this.queryParams.canteenId,
"shopstallId": this.queryParams.shopstallId,
"dishesName": this.queryParams.dishesName,
// "typeIdList": this.$refs.typeTree.getCheckedKeys(),
"typeIdList": this.$refs.typeTree.getCheckedKeys(),
}
getMenuDishesListApi(params).then((response) => {
this.tableList = response.rows;

8
src/views/dish/material/index.vue
View File

@ -23,7 +23,7 @@
:data="treeOptions"
:props="defaultProps"
:show-checkbox="true"
:default-expand-all="false"
:default-expand-all="true"
:expand-on-click-node="false"
:filter-node-method="filterNode"
ref="typeTree"
@ -600,7 +600,7 @@ export default {
this.resetForm("queryForm");
this.queryParams.pageNum = 1;
this.queryParams.pageSize = 10;
// this.$refs.typeTree.setCheckedNodes([]);
this.$refs.typeTree.setCheckedNodes([]);
this.handleQuery();
},
/** 查询列表 */
@ -678,7 +678,7 @@ export default {
},
handleSelectionChange(selection){
this.batchIds = []
this.batchIds = selection.map((item) => item.materialId)
this.batchIds = selection.map((item) => item.id)
this.editForm.categoryNames = "";
this.editForm.categoryNames = selection.map((item) => item.materialName);
this.single = selection.length !== 1
@ -687,7 +687,7 @@ export default {
// 批量删除
handleBatchDel(){
console.log(this.batchIds)
batchRemoveMaterialApi(this.batchIds).then(response => {
removeMaterialApi({"ids":this.batchIds}).then(response => {
this.$modal.msgSuccess("删除成功");
this.$refs.multipleTable.clearSelection()
this.getList();

49
src/views/dish/nutritionInfo/index.vue
View File

@ -24,15 +24,15 @@
:data="cascaderOptions" :props="defaultProps"
:show-checkbox="true" :default-expand-all="true"
:expand-on-click-node="false" :filter-node-method="filterNode"
ref="typeTree" node-key="id" highlight-current @node-click="handleNodeClick"
ref="nutritionTypeTree" node-key="id" highlight-current @node-click="handleNodeClick"
>
<span class="custom-tree-node" slot-scope="{ node, data }" @mousemove="onMousemove(data)" @mouseleave="onMouseleave()">
<span v-if="isMousemoveId === data.value && node.label.length > 10">{{
<span v-if="isMousemoveId === data.id && node.label.length > 10">{{
node.label.slice(0, 10) + "..."
}}</span>
<span v-else>{{ node.label }}</span>
<span class="btn-items" v-if="isMousemoveId === data.value">
<span class="btn-items" v-if="isMousemoveId === data.id">
<el-button
type="text"
size="mini"
@ -64,7 +64,7 @@
<!--用户数据-->
<el-col :span="20" :xs="24">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="98px">
<el-form-item label="营养信息类别" prop="type" >
<!-- <el-form-item label="营养信息类别" prop="type" >
<el-cascader
v-model="typeSelected" clearable
:options="cascaderOptions"
@ -75,7 +75,7 @@
}"
@change="handleChange"
></el-cascader>
</el-form-item>
</el-form-item> -->
<el-form-item label="食材编码" prop="nutritionCode">
<el-input
@ -188,7 +188,7 @@
:props="{
emitPath: false,// 若设置 false，则只返回该节点的值，只返回最后选择的id
checkStrictly: false,//来设置父子节点取消选中关联，从而达到选择任意一级选项的目的
value:'value',label:'label'
value:'id',label:'label'
}"
placeholder="请选择营养信息类别"
clearable @change="chosenType"
@ -589,7 +589,7 @@ export default {
pageSize: 10,
nutritionCode: undefined,
nutritionName: undefined,
type: undefined,
// type: undefined,
bigType: undefined,
littleType: undefined
},
@ -644,7 +644,7 @@ export default {
defaultProps: {
children: "children",
label: "label",
id: "value"
id: "id"
},
keyWord:"",//左侧树-关键字查询
isMousemoveId: null,
@ -663,14 +663,14 @@ export default {
},
};
},
created() {
mounted() {
this.getNutritionTypeList();
this.getList();
},
watch: {
// 根据名称筛选部门树
keyWord(val) {
this.$refs.typeTree.filter(val);
this.$refs.nutritionTypeTree.filter(val);
},
},
methods: {
@ -691,12 +691,12 @@ export default {
return [];
}
return this.typeTreeData.map(item => ({
value: item.id,
id: item.id,
label: item.bigType,
parentId:0,
level:1,
children: item.littleTypeList.map(subItem => ({
value: subItem.id,//父子类别value一致时选中识别不出来，加个#号区分
id: subItem.id,//父子类别value一致时选中识别不出来，加个#号区分
label: subItem.bigType,
bigType: item.bigType,
parentId:item.id,
@ -719,7 +719,7 @@ export default {
console.log(data)
if(data&&data.level==1){
this.typeForm={}
this.typeForm.parentId = data.value;
this.typeForm.parentId = data.id;
this.typeForm.parentName = data.label;
}else{
this.typeForm={}
@ -734,7 +734,7 @@ export default {
console.log(data)
this.typeForm={}
this.resetForm("typeForm");
this.$set(this.typeForm,"id",data.value)
this.$set(this.typeForm,"id",data.id)
this.$set(this.typeForm,"name",data.label)
// this.typeForm = {
// ...data
@ -758,7 +758,7 @@ export default {
.catch(() => {});
},
onMousemove(data) {
this.isMousemoveId = data.value;
this.isMousemoveId = data.id;
},
onMouseleave() {
this.isMousemoveId = null;
@ -799,9 +799,12 @@ export default {
this.queryParams.littleType = undefined;
}
},
/** 查询岗位列表 */
/** 查询列表 */
getList() {
this.loading = true;
// console.log(this.$refs.nutritionTypeTree.getCheckedKeys())
let arr = this.$refs.nutritionTypeTree.getCheckedKeys()||[]
this.queryParams.categoryIds = arr;
console.log(this.queryParams)
listNutrition(this.queryParams).then(response => {
this.menuNutritionList = response.rows;
@ -856,15 +859,16 @@ export default {
* @description 重置页码为1并获取列表数据
*/
handleQuery() {
this.queryParams.pageNum = 1;
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.typeSelected = []; // 清空级联选择器的选中值
this.queryParams.bigType = undefined;
this.queryParams.littleType = undefined;
this.$refs.nutritionTypeTree.setCheckedNodes([]);
// this.typeSelected = []; // 清空级联选择器的选中值
// this.queryParams.bigType = undefined;
// this.queryParams.littleType = undefined;
this.handleQuery();
},
/** 新增按钮操作 */
@ -883,6 +887,7 @@ export default {
getNutrition(data).then(response => {
this.form = response.data;
this.$set(this.form,"categoryId",Number(response.data.categoryId))
this.chosenType(this.form.categoryId)
this.open = true;
this.title = "修改营养信息";
});
@ -891,7 +896,7 @@ export default {
getParentCategoryName(Id) {
const findNode = (nodes) => {
for (let node of nodes) {
if (node.value === Id) {
if (node.id === Id) {
return node;
}
if (node.children) {
@ -904,9 +909,11 @@ export default {
return findNode(this.cascaderOptions);
},
chosenType(e){
console.log(e)
let obj = this.getParentCategoryName(e)
this.form.bigType = obj.bigType
this.form.littleType = obj.label
console.log(this.form)
},
/** 提交按钮 */
submitForm: function() {

2
src/views/system/user/index.vue
View File

@ -467,7 +467,7 @@
<el-row>
<el-col :span="12">
<el-form-item label="用户类别">
<el-select v-model="form.psnType" placeholder="请选择用户类别">
<el-select v-model="form.userType" placeholder="请选择用户类别">
<el-option
v-for="dict in dict.type.sys_user_type"
:key="dict.value"