Bug修改
This commit is contained in:
parent
64d6d81279
commit
a46d22933a
|
|
@ -171,7 +171,7 @@
|
|||
</div>
|
||||
<div class="dialog-right">
|
||||
<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="canteenName" />
|
||||
<el-table-column label="规格" align="center" prop="sizeType">
|
||||
|
|
|
|||
|
|
@ -171,7 +171,7 @@
|
|||
</div>
|
||||
<div class="dialog-right">
|
||||
<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="canteenName" />
|
||||
<el-table-column label="规格" align="center" prop="sizeType">
|
||||
|
|
@ -1735,6 +1735,7 @@ export default {
|
|||
//确认复制
|
||||
confirmCopyMenu(){
|
||||
this.$modal.confirm('当前日期会被覆盖!确定复制?').then(() => {
|
||||
// this.detailList=[]
|
||||
this.detailList = [
|
||||
{
|
||||
mealtimeType:"1",
|
||||
|
|
@ -1837,34 +1838,36 @@ export default {
|
|||
this.$modal.confirm('所选日期数据会被覆盖!确定复制?').then(() => {
|
||||
this.checkDateList.forEach(item=>{
|
||||
let index = this.dateRangeList.findIndex(v=>v.applyDate.indexOf(item)>-1)
|
||||
const arr = [
|
||||
{
|
||||
mealtimeType:"1",
|
||||
mealtimeName:"早餐",
|
||||
dishesList:[...this.detailList[0].dishesList]
|
||||
},
|
||||
{
|
||||
mealtimeType:"2",
|
||||
mealtimeName:"午餐",
|
||||
dishesList:[...this.detailList[1].dishesList]
|
||||
},
|
||||
{
|
||||
mealtimeType:"3",
|
||||
mealtimeName:"下午茶",
|
||||
dishesList:[...this.detailList[2].dishesList]
|
||||
},
|
||||
{
|
||||
mealtimeType:"4",
|
||||
mealtimeName:"晚餐",
|
||||
dishesList:[...this.detailList[3].dishesList]
|
||||
},
|
||||
{
|
||||
mealtimeType:"5",
|
||||
mealtimeName:"夜宵",
|
||||
dishesList:[...this.detailList[4].dishesList]
|
||||
}
|
||||
];
|
||||
this.dateRangeList[index].detailList = JSON.parse(JSON.stringify(arr))
|
||||
if(index>-1){
|
||||
const arr = [
|
||||
{
|
||||
mealtimeType:"1",
|
||||
mealtimeName:"早餐",
|
||||
dishesList:[...this.detailList[0].dishesList]
|
||||
},
|
||||
{
|
||||
mealtimeType:"2",
|
||||
mealtimeName:"午餐",
|
||||
dishesList:[...this.detailList[1].dishesList]
|
||||
},
|
||||
{
|
||||
mealtimeType:"3",
|
||||
mealtimeName:"下午茶",
|
||||
dishesList:[...this.detailList[2].dishesList]
|
||||
},
|
||||
{
|
||||
mealtimeType:"4",
|
||||
mealtimeName:"晚餐",
|
||||
dishesList:[...this.detailList[3].dishesList]
|
||||
},
|
||||
{
|
||||
mealtimeType:"5",
|
||||
mealtimeName:"夜宵",
|
||||
dishesList:[...this.detailList[4].dishesList]
|
||||
}
|
||||
];
|
||||
this.dateRangeList[index].detailList = JSON.parse(JSON.stringify(arr))
|
||||
}
|
||||
});
|
||||
this.$modal.msgSuccess("复制成功");
|
||||
this.openCopyDate = false
|
||||
|
|
|
|||
|
|
@ -100,7 +100,7 @@
|
|||
</template>
|
||||
</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">
|
||||
<el-tooltip placement="top">
|
||||
<div slot="content">
|
||||
|
|
|
|||
|
|
@ -446,7 +446,7 @@ export default {
|
|||
var str = "";
|
||||
var no = "NO.";
|
||||
num = index + 1;
|
||||
value = value.length > 8 ? value.slice(0, 8) + '...' : value
|
||||
value = value.length > 5 ? value.slice(0, 5) + '...' : value
|
||||
if (index === 0) {
|
||||
str = " {num1|" + num + "} {title1|" + value + "}";
|
||||
} else if (index === 1) {
|
||||
|
|
|
|||
|
|
@ -78,7 +78,7 @@
|
|||
<span v-if="scope.row.mealtimeType==5">夜宵</span>
|
||||
</template>
|
||||
</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="留样重量(g)" align="center" prop="sampleWeight" :show-overflow-tooltip="true" />
|
||||
<el-table-column label="所在留样柜" align="center" prop="deviceName" :show-overflow-tooltip="true" />
|
||||
|
|
|
|||
Loading…
Reference in New Issue