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

前端修改

This commit is contained in:
zzyuan 2025-06-04 17:59:09 +08:00
parent 741ad1a41f
commit 96cd6b48ba
8 changed files with 80 additions and 122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/api/superStore/device.js
View File

@ -3,12 +3,12 @@ import request from '@/utils/request'
// 通过区域Id查询超市 // 通过区域Id查询超市
export function getSupermarketByAreaApi(data) { export function getSupermarketByAreaApi(data) {
return request({ return request({
url: '/smart-canteen/supermarket_info/getSupermarketList', url: '/smart-canteen/supermarket_info/list',
method: 'post', method: 'get',
headers: { headers: {
"merchant-id":"378915229716713472", "merchant-id":"378915229716713472",
}, },
data: data params: data
}) })
} }

17
src/api/superStore/orderShenhe.js
View File

@ -1,25 +1,14 @@
import request from '@/utils/request' import request from '@/utils/request'
// 系统区域权限树
export function systemAreaTreeApi(data) {
return request({
url: '/smart-canteen/api/v2/alloc/area/system-auth/tree',
method: 'post',
headers: {
"merchant-id":"378915229716713472",
},
data: data
})
}
// 通过区域Id查询超市 // 通过区域Id查询超市
export function getSupermarketByAreaApi(data) { export function getSupermarketByAreaApi(data) {
return request({ return request({
url: '/smart-canteen/api/v1/basics-supermarket/page-supermarket', url: '/smart-canteen/supermarket_info/list',
method: 'post', method: 'get',
headers: { headers: {
"merchant-id":"378915229716713472", "merchant-id":"378915229716713472",
}, },
data: data params: data
}) })
} }
// 通过区域Id查询食堂 // 通过区域Id查询食堂

17
src/api/superStore/salesSummary.js
View File

@ -1,24 +1,13 @@
import request from '@/utils/request' import request from '@/utils/request'
// 系统区域权限树
export function systemAreaTreeApi(data) {
return request({
url: '/smart-canteen/api/v2/alloc/area/system-auth/tree',
method: 'post',
headers: {
"merchant-id":"378915229716713472",
},
data: data
})
}
// 通过区域Id查询超市 // 通过区域Id查询超市
export function getSupermarketByAreaApi(data) { export function getSupermarketByAreaApi(data) {
return request({ return request({
url: '/smart-canteen/api/v1/basics-supermarket/page-supermarket', url: '/smart-canteen/supermarket_info/list',
method: 'post', method: 'get',
headers: { headers: {
"merchant-id":"378915229716713472", "merchant-id":"378915229716713472",
}, },
data: data params: data
}) })
} }

18
src/api/superStore/superOrder.js
View File

@ -1,26 +1,14 @@
import request from '@/utils/request' import request from '@/utils/request'
// 系统区域权限树
export function systemAreaTreeApi(data) {
return request({
url: '/smart-canteen/api/v2/alloc/area/system-auth/tree',
method: 'post',
headers: {
"merchant-id":"378915229716713472",
},
data: data
})
}
// 通过区域Id查询超市 // 通过区域Id查询超市
export function getSupermarketByAreaApi(data) { export function getSupermarketByAreaApi(data) {
return request({ return request({
url: '/smart-canteen/api/v1/basics-supermarket/page-supermarket', url: '/smart-canteen/supermarket_info/list',
method: 'post', method: 'get',
headers: { headers: {
"merchant-id":"378915229716713472", "merchant-id":"378915229716713472",
}, },
data: data params: data
}) })
} }

6
src/views/dish/menu/index.vue
View File

@ -105,7 +105,7 @@
<el-tooltip placement="top"> <el-tooltip placement="top">
<div slot="content"> <div slot="content">
<div v-if="scope.row.detail"> <div v-if="scope.row.detail">
<div v-for="subItem in scope.row.detail.details" :key="subItem.detailId"> <div v-for="subItem in scope.row.detail.detailList" :key="subItem.detailId">
<div v-if="subItem.mealtimeType==item.mealtimeType" style="display: flex;max-width: 320px;flex-wrap: wrap;"> <div v-if="subItem.mealtimeType==item.mealtimeType" style="display: flex;max-width: 320px;flex-wrap: wrap;">
<div v-for="(lastItem) in subItem.dishesList" :key="lastItem.dishesId"> <div v-for="(lastItem) in subItem.dishesList" :key="lastItem.dishesId">
<div>{{ lastItem.dishesName }}; </div> <div>{{ lastItem.dishesName }}; </div>
@ -119,7 +119,7 @@
</div> </div>
<div v-if="scope.row.detail"> <div v-if="scope.row.detail">
<div v-for="subItem in scope.row.detail.details" :key="subItem.detailId"> <div v-for="subItem in scope.row.detail.detailList" :key="subItem.detailId">
<div v-if="subItem.mealtimeType==item.mealtimeType"> <div v-if="subItem.mealtimeType==item.mealtimeType">
<div v-for="(lastItem,index) in subItem.dishesList" :key="lastItem.dishesId"> <div v-for="(lastItem,index) in subItem.dishesList" :key="lastItem.dishesId">
<div v-if="index<4">{{ lastItem.dishesName }}</div> <div v-if="index<4">{{ lastItem.dishesName }}</div>
@ -134,7 +134,7 @@
</el-tooltip> </el-tooltip>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="菜谱更新时间" align="center" prop="updateTime" width="150" v-if="activeName=='currentRecipe'"/> <el-table-column label="菜谱更新时间" align="center" prop="uptime" width="150" v-if="activeName=='currentRecipe'"/>
<el-table-column label="菜谱类型" align="center" prop="recipeType" v-if="activeName=='pageRecipe'"> <el-table-column label="菜谱类型" align="center" prop="recipeType" v-if="activeName=='pageRecipe'">
<template slot-scope="scope"> <template slot-scope="scope">

103
src/views/superstore/doubleScreen/index.vue
View File

@ -109,56 +109,6 @@
<!-- 基础设置 --> <!-- 基础设置 -->
<el-tab-pane label="基础设置" name="baseSetting" style="height: 400px;"> <el-tab-pane label="基础设置" name="baseSetting" style="height: 400px;">
<el-form ref="baseForm" :model="baseForm" :rules="baseFormRules" label-width="80px"> <el-form ref="baseForm" :model="baseForm" :rules="baseFormRules" label-width="80px">
<el-row>
<el-col :span="12">
<el-form-item label="设备编号" prop="deviceNumber">
<el-input v-model="baseForm.deviceNumber" placeholder="请输入设备编号" maxlength="30" clearable :disabled="title=='查看'"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="设备名称" prop="deviceName">
<el-input v-model="baseForm.deviceName" placeholder="请输入设备名称" maxlength="30" clearable :disabled="title=='查看'"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="设备Sn" prop="deviceSn">
<el-input v-model="baseForm.deviceSn" placeholder="请输入设备Sn" maxlength="30" clearable :disabled="title=='查看'"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="设备Ip" prop="deviceIp">
<el-input v-model="baseForm.deviceIp" placeholder="请输入设备Ip" maxlength="30" clearable :disabled="title=='查看'"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="设备key" prop="deviceKey">
<el-input v-model="baseForm.deviceKey" placeholder="请输入设备key" maxlength="30" clearable :disabled="title=='查看'"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="设备Mac" prop="deviceMac">
<el-input v-model="baseForm.deviceMac" placeholder="请输入设备key" maxlength="30" clearable :disabled="title=='查看'"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="设备型号" prop="deviceModel">
<el-input v-model="baseForm.deviceModel" placeholder="请输入设备型号" maxlength="30" clearable :disabled="title=='查看'"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="安装地址" prop="deviceAddr">
<el-input v-model="baseForm.deviceAddr" placeholder="请输入安装地址" maxlength="30" clearable :disabled="title=='查看'"/>
</el-form-item>
</el-col>
</el-row>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="所属区域" prop="areaId"> <el-form-item label="所属区域" prop="areaId">
@ -185,8 +135,49 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12">
<el-form-item label="设备编号" prop="deviceNumber">
<el-input v-model="baseForm.deviceNumber" placeholder="请输入设备编号" maxlength="30" clearable :disabled="title=='查看'"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="设备名称" prop="deviceName">
<el-input v-model="baseForm.deviceName" placeholder="请输入设备名称" maxlength="30" clearable :disabled="title=='查看'"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="设备Sn" prop="deviceSn">
<el-input v-model="baseForm.deviceSn" placeholder="请输入设备Sn" maxlength="30" clearable :disabled="title=='查看'"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="设备Ip" prop="deviceIp">
<el-input v-model="baseForm.deviceIp" placeholder="请输入设备Ip" maxlength="30" clearable :disabled="title=='查看'"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="设备key" prop="deviceKey">
<el-input v-model="baseForm.deviceKey" placeholder="请输入设备key" maxlength="30" clearable :disabled="title=='查看'"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="设备Mac" prop="deviceMac">
<el-input v-model="baseForm.deviceMac" placeholder="请输入设备key" maxlength="30" clearable :disabled="title=='查看'"/>
</el-form-item>
</el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12">
<el-form-item label="设备型号" prop="deviceModel">
<el-input v-model="baseForm.deviceModel" placeholder="请输入设备型号" maxlength="30" clearable :disabled="title=='查看'"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="安装地址" prop="deviceAddr">
<el-input v-model="baseForm.deviceAddr" placeholder="请输入安装地址" maxlength="30" clearable :disabled="title=='查看'"/>
</el-form-item>
</el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="密码" prop="devicePwd"> <el-form-item label="密码" prop="devicePwd">
<el-input v-model="baseForm.devicePwd" placeholder="请输入密码" maxlength="30" clearable :disabled="title=='查看'"/> <el-input v-model="baseForm.devicePwd" placeholder="请输入密码" maxlength="30" clearable :disabled="title=='查看'"/>
@ -303,7 +294,8 @@
//查询-区域树 //查询-区域树
handleTreeChange(e){ handleTreeChange(e){
let param= { let param= {
areaId:this.queryParams.areaId "areaId":this.queryParams.areaId,
"pagenation":true
} }
getSupermarketByAreaApi(param).then((response) => { getSupermarketByAreaApi(param).then((response) => {
this.supermarketOptions=response.rows||[] this.supermarketOptions=response.rows||[]
@ -357,7 +349,8 @@
handleUpdate(row) { handleUpdate(row) {
this.reset(); this.reset();
let param= { let param= {
areaId:row.areaId "areaId":row.areaId,
"pagenation":true
} }
getSupermarketByAreaApi(param).then((response) => { getSupermarketByAreaApi(param).then((response) => {
this.supermarketOptions2=response.rows||[] this.supermarketOptions2=response.rows||[]
@ -372,7 +365,8 @@
handleView(row) { handleView(row) {
this.reset(); this.reset();
let param= { let param= {
areaId:row.areaId "areaId":row.areaId,
"pagenation":true
} }
getSupermarketByAreaApi(param).then((response) => { getSupermarketByAreaApi(param).then((response) => {
this.supermarketOptions2=response.rows||[] this.supermarketOptions2=response.rows||[]
@ -390,7 +384,8 @@
handleTreeChange2(val){ handleTreeChange2(val){
setTimeout(()=>{ setTimeout(()=>{
let param= { let param= {
areaId:val "areaId":val,
"pagenation":true
} }
getSupermarketByAreaApi(param).then((response) => { getSupermarketByAreaApi(param).then((response) => {
this.supermarketOptions2=response.rows||[] this.supermarketOptions2=response.rows||[]

18
src/views/superstore/salesSummary/categorySalesSummary.vue
View File

@ -14,8 +14,8 @@
:picker-options="pickerOptions" > :picker-options="pickerOptions" >
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="所属区域" prop="areaIdList"> <el-form-item label="所属区域" prop="areaId">
<el-cascader v-model="queryParams.areaIdList" <el-cascader v-model="queryParams.areaId"
:options="treeAreaOptions" :filterable="true" style="width: 220px" :show-all-levels="false" :options="treeAreaOptions" :filterable="true" style="width: 220px" :show-all-levels="false"
:props="{ :props="{
emitPath: false,// 若设置 false，则只返回该节点的值，只返回最后选择的id emitPath: false,// 若设置 false，则只返回该节点的值，只返回最后选择的id
@ -35,7 +35,7 @@
</el-form-item> </el-form-item>
<br> <br>
<el-form-item label="商品类别" prop="categoryIdList"> <el-form-item label="商品类别" prop="categoryIdList">
<el-cascader v-model="queryParams.areaIdList" <el-cascader v-model="queryParams.categoryIdList"
:options="categoryTypeOptions" :filterable="true" style="width: 220px" :show-all-levels="false" :options="categoryTypeOptions" :filterable="true" style="width: 220px" :show-all-levels="false"
:props="{ :props="{
multiple: true, multiple: true,
@ -121,7 +121,7 @@
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
areaIdList:[], areaId:null,
canteenIdList:[], canteenIdList:[],
materialName:null, materialName:null,
categoryIdList:[], categoryIdList:[],
@ -173,11 +173,9 @@
}); });
}, },
handleAreaChange(e){ handleAreaChange(e){
console.log(this.queryParams.areaIdList)
let param= { let param= {
areaIdList:this.queryParams.areaIdList, "areaId":this.queryParams.areaId,
current:1, "pagenation":true
size:-1
} }
getSupermarketByAreaApi(param).then((response) => { getSupermarketByAreaApi(param).then((response) => {
this.supermarketOptions=response.records||[] this.supermarketOptions=response.records||[]
@ -200,7 +198,7 @@
this.queryParams = { this.queryParams = {
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
areaIdList:[], areaId:null,
canteenIdList:[], canteenIdList:[],
materialName:null, materialName:null,
categoryIdList:[], categoryIdList:[],
@ -214,7 +212,7 @@
getList() { getList() {
this.loading = true; this.loading = true;
let param = { let param = {
"areaIdList":this.queryParams.areaIdList, "areaId":this.queryParams.areaId,
"canteenIdList":this.queryParams.canteenIdList, "canteenIdList":this.queryParams.canteenIdList,
"categoryIdList":this.queryParams.categoryIdList, "categoryIdList":this.queryParams.categoryIdList,
"saleType":this.queryParams.saleType, "saleType":this.queryParams.saleType,

11
src/views/superstore/salesSummary/productSalesSummary.vue
View File

@ -138,7 +138,7 @@
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
areaIdList:[], areaId:null,
canteenIdList:[], canteenIdList:[],
materialName:null, materialName:null,
categoryIdList:[], categoryIdList:[],
@ -191,9 +191,8 @@
}, },
handleAreaChange(e){ handleAreaChange(e){
let param= { let param= {
areaIdList:this.queryParams.areaIdList, "areaId":this.queryParams.areaId,
current:1, "pagenation":true
size:-1
} }
getSupermarketByAreaApi(param).then((response) => { getSupermarketByAreaApi(param).then((response) => {
this.supermarketOptions=response.records||[] this.supermarketOptions=response.records||[]
@ -216,7 +215,7 @@
this.queryParams = { this.queryParams = {
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
areaIdList:[], areaId:null,
canteenIdList:[], canteenIdList:[],
materialName:null, materialName:null,
categoryIdList:[], categoryIdList:[],
@ -230,7 +229,7 @@
getList() { getList() {
this.loading = true; this.loading = true;
let param = { let param = {
"areaIdList":this.queryParams.areaIdList, "areaId":this.queryParams.areaId,
"canteenIdList":this.queryParams.canteenIdList, "canteenIdList":this.queryParams.canteenIdList,
"categoryIdList":this.queryParams.categoryIdList, "categoryIdList":this.queryParams.categoryIdList,
"materialName":this.queryParams.materialName, "materialName":this.queryParams.materialName,