diff --git a/src/views/canteen/dish/menu/detail.vue b/src/views/canteen/dish/menu/detail.vue
index c50c6ef0..1bf139d2 100644
--- a/src/views/canteen/dish/menu/detail.vue
+++ b/src/views/canteen/dish/menu/detail.vue
@@ -171,7 +171,7 @@
-
+
diff --git a/src/views/canteen/dish/menu/edit.vue b/src/views/canteen/dish/menu/edit.vue
index 818cafd6..7d329cdd 100644
--- a/src/views/canteen/dish/menu/edit.vue
+++ b/src/views/canteen/dish/menu/edit.vue
@@ -171,7 +171,7 @@
-
+
@@ -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
diff --git a/src/views/canteen/dish/menu/index.vue b/src/views/canteen/dish/menu/index.vue
index 5c1029ac..eae0d750 100644
--- a/src/views/canteen/dish/menu/index.vue
+++ b/src/views/canteen/dish/menu/index.vue
@@ -100,7 +100,7 @@
-
+
diff --git a/src/views/index_v1.vue b/src/views/index_v1.vue
index 2985e222..6e8973d4 100644
--- a/src/views/index_v1.vue
+++ b/src/views/index_v1.vue
@@ -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) {
diff --git a/src/views/kitchen/foodSafety/sampleManage/index.vue b/src/views/kitchen/foodSafety/sampleManage/index.vue
index 59c5adf3..f5844e31 100644
--- a/src/views/kitchen/foodSafety/sampleManage/index.vue
+++ b/src/views/kitchen/foodSafety/sampleManage/index.vue
@@ -78,7 +78,7 @@
夜宵
-
+