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

Bug修改

This commit is contained in:
zzyuan 2025-10-28 17:54:16 +08:00
parent 64d6d81279
commit a46d22933a
5 changed files with 36 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/canteen/dish/menu/detail.vue
View File

@ -171,7 +171,7 @@
</div> </div>
<div class="dialog-right"> <div class="dialog-right">
<el-table :data="dishesTableList" height="620"> <el-table :data="dishesTableList" height="620">
<el-table-column label="菜品编号" align="center" prop="dishesNum" /> <!-- <el-table-column label="菜品编号" align="center" prop="dishesNum" /> -->
<el-table-column label="菜品名称" align="center" prop="dishesName" /> <el-table-column label="菜品名称" align="center" prop="dishesName" />
<el-table-column label="所属食堂" align="center" prop="canteenName" /> <el-table-column label="所属食堂" align="center" prop="canteenName" />
<el-table-column label="规格" align="center" prop="sizeType"> <el-table-column label="规格" align="center" prop="sizeType">

61
src/views/canteen/dish/menu/edit.vue
View File

@ -171,7 +171,7 @@
</div> </div>
<div class="dialog-right"> <div class="dialog-right">
<el-table :data="dishesTableList" height="620"> <el-table :data="dishesTableList" height="620">
<el-table-column label="菜品编号" align="center" prop="dishesNum" /> <!-- <el-table-column label="菜品编号" align="center" prop="dishesNum" /> -->
<el-table-column label="菜品名称" align="center" prop="dishesName" /> <el-table-column label="菜品名称" align="center" prop="dishesName" />
<el-table-column label="所属食堂" align="center" prop="canteenName" /> <el-table-column label="所属食堂" align="center" prop="canteenName" />
<el-table-column label="规格" align="center" prop="sizeType"> <el-table-column label="规格" align="center" prop="sizeType">
@ -1735,6 +1735,7 @@ export default {
//确认复制 //确认复制
confirmCopyMenu(){ confirmCopyMenu(){
this.$modal.confirm('当前日期会被覆盖！确定复制？').then(() => { this.$modal.confirm('当前日期会被覆盖！确定复制？').then(() => {
// this.detailList=[]
this.detailList = [ this.detailList = [
{ {
mealtimeType:"1", mealtimeType:"1",
@ -1837,34 +1838,36 @@ export default {
this.$modal.confirm('所选日期数据会被覆盖！确定复制？').then(() => { this.$modal.confirm('所选日期数据会被覆盖！确定复制？').then(() => {
this.checkDateList.forEach(item=>{ this.checkDateList.forEach(item=>{
let index = this.dateRangeList.findIndex(v=>v.applyDate.indexOf(item)>-1) let index = this.dateRangeList.findIndex(v=>v.applyDate.indexOf(item)>-1)
const arr = [ if(index>-1){
{ const arr = [
mealtimeType:"1", {
mealtimeName:"早餐", mealtimeType:"1",
dishesList:[...this.detailList[0].dishesList] mealtimeName:"早餐",
}, dishesList:[...this.detailList[0].dishesList]
{ },
mealtimeType:"2", {
mealtimeName:"午餐", mealtimeType:"2",
dishesList:[...this.detailList[1].dishesList] mealtimeName:"午餐",
}, dishesList:[...this.detailList[1].dishesList]
{ },
mealtimeType:"3", {
mealtimeName:"下午茶", mealtimeType:"3",
dishesList:[...this.detailList[2].dishesList] mealtimeName:"下午茶",
}, dishesList:[...this.detailList[2].dishesList]
{ },
mealtimeType:"4", {
mealtimeName:"晚餐", mealtimeType:"4",
dishesList:[...this.detailList[3].dishesList] mealtimeName:"晚餐",
}, dishesList:[...this.detailList[3].dishesList]
{ },
mealtimeType:"5", {
mealtimeName:"夜宵", mealtimeType:"5",
dishesList:[...this.detailList[4].dishesList] mealtimeName:"夜宵",
} dishesList:[...this.detailList[4].dishesList]
]; }
this.dateRangeList[index].detailList = JSON.parse(JSON.stringify(arr)) ];
this.dateRangeList[index].detailList = JSON.parse(JSON.stringify(arr))
}
}); });
this.$modal.msgSuccess("复制成功"); this.$modal.msgSuccess("复制成功");
this.openCopyDate = false this.openCopyDate = false

2
src/views/canteen/dish/menu/index.vue
View File

@ -100,7 +100,7 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column v-for="item in mealTimeList" :key="item.mealtimeType" :label="item.mealtimeName" :show-overflow-tooltip="true" align="center" v-if="activeName=='currentRecipe'"> <el-table-column v-for="item in mealTimeList" :key="item.mealtimeType" :label="item.mealtimeName" align="center" v-if="activeName=='currentRecipe'">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tooltip placement="top"> <el-tooltip placement="top">
<div slot="content"> <div slot="content">

2
src/views/index_v1.vue
View File

@ -446,7 +446,7 @@ export default {
var str = ""; var str = "";
var no = "NO."; var no = "NO.";
num = index + 1; num = index + 1;
value = value.length > 8 ? value.slice(0, 8) + '...' : value value = value.length > 5 ? value.slice(0, 5) + '...' : value
if (index === 0) { if (index === 0) {
str = " {num1|" + num + "} {title1|" + value + "}"; str = " {num1|" + num + "} {title1|" + value + "}";
} else if (index === 1) { } else if (index === 1) {

2
src/views/kitchen/foodSafety/sampleManage/index.vue
View File

@ -78,7 +78,7 @@
<span v-if="scope.row.mealtimeType==5">夜宵</span> <span v-if="scope.row.mealtimeType==5">夜宵</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="菜品编号" align="center" prop="dishesId" :show-overflow-tooltip="true" /> <!-- <el-table-column label="菜品编号" align="center" prop="dishesId" :show-overflow-tooltip="true" /> -->
<el-table-column label="菜品名称" align="center" prop="dishesName" :show-overflow-tooltip="true" /> <el-table-column label="菜品名称" align="center" prop="dishesName" :show-overflow-tooltip="true" />
<el-table-column label="留样重量(g)" align="center" prop="sampleWeight" :show-overflow-tooltip="true" /> <el-table-column label="留样重量(g)" align="center" prop="sampleWeight" :show-overflow-tooltip="true" />
<el-table-column label="所在留样柜" align="center" prop="deviceName" :show-overflow-tooltip="true" /> <el-table-column label="所在留样柜" align="center" prop="deviceName" :show-overflow-tooltip="true" />