Merge branch 'master' of http://101.43.194.146:10101/root/supervision-ui

src/views/grassrootsregistration/bdglcookbook/index.vue

@@ -2126,48 +2126,52 @@ export default {
             element.weeklist === "星期一" &&
             element.timelist === "早餐" &&
             element.typelist === "主食" &&
-            element.cookcategoryIds !== null &&
-            element.peopleIds !== null
+            element.cookcategoryNames !== null &&
+            element.peopleIds !== ","
           ) {
             this.zaoZu1 = element;
             this.Monday.zaoZu1 = this.zaoZu1.cookcategoryIds.split(",");
             this.Monday.zaoZu1 = this.Monday.zaoZu1.map((i) => parseInt(i, 0));
             this.Monday.zaoZu1Ren = this.zaoZu1.peopleIds.split(",");
-              this.Monday.zaoZu1Ren = this.Monday.zaoZu1Ren.map((i) => parseInt(i, 0));
+            this.Monday.zaoZu1Ren = this.Monday.zaoZu1Ren.map((i) =>
+              parseInt(i, 0)
+            );
           } else if (
             element.weeklist === "星期一" &&
             element.timelist === "早餐" &&
             element.typelist === "副食" &&
-            element.cookcategoryIds !== null &&
-            element.peopleIds !== null
+            element.cookcategoryNames !== null &&
+            element.peopleIds !== ","
           ) {
             this.zaoFu1 = element;
             this.Monday.zaoFu1 = this.zaoFu1.cookcategoryIds.split(",");
             this.Monday.zaoFu1 = this.Monday.zaoFu1.map((i) => parseInt(i, 0));
             this.Monday.zaoFu1Ren = this.zaoFu1.peopleIds.split(",");
-             this.Monday.zaoFu1Ren = this.Monday.zaoFu1Ren.map((i) => parseInt(i, 0));
+            this.Monday.zaoFu1Ren = this.Monday.zaoFu1Ren.map((i) =>
+              parseInt(i, 0)
+            );
           } else if (
             element.weeklist === "星期一" &&
             element.timelist === "午餐" &&
             element.typelist === "主食" &&
-            element.cookcategoryIds !== null &&
-            element.peopleIds !== null
+            element.cookcategoryNames !== null &&
+            element.peopleIds !== ","
           ) {
             this.zhongZhu1 = element;
             this.Monday.zhongZu1 = this.zhongZhu1.cookcategoryIds.split(",");
             this.Monday.zhongZu1 = this.Monday.zhongZu1.map((i) =>
-              parseInt(i, 0) 
+              parseInt(i, 0)
             );
             this.Monday.zhongZu1Ren = this.zhongZhu1.peopleIds.split(",");
-              this.Monday.zhongZu1Ren = this.Monday.zhongZu1Ren.map((i) =>
+            this.Monday.zhongZu1Ren = this.Monday.zhongZu1Ren.map((i) =>
               parseInt(i, 0)
             );
           } else if (
             element.weeklist === "星期一" &&
             element.timelist === "午餐" &&
             element.typelist === "副食" &&
-            element.cookcategoryIds !== null &&
-            element.peopleIds !== null
+            element.cookcategoryNames !== null &&
+            element.peopleIds !== ","
           ) {
             this.zhongFu1 = element;
             this.Monday.zhongFu1 = this.zhongFu1.cookcategoryIds.split(",");
@@ -2175,39 +2179,43 @@ export default {
               parseInt(i, 0)
             );
             this.Monday.zhongFu1Ren = this.zhongFu1.peopleIds.split(",");
-              this.Monday.zhongFu1Ren = this.Monday.zhongFu1Ren.map((i) =>
+            this.Monday.zhongFu1Ren = this.Monday.zhongFu1Ren.map((i) =>
               parseInt(i, 0)
             );
           } else if (
             element.weeklist === "星期一" &&
             element.timelist === "晚餐" &&
             element.typelist === "主食" &&
-            element.cookcategoryIds !== null &&
-            element.peopleIds !== null
+            element.cookcategoryNames !== null &&
+            element.peopleIds !== ","
           ) {
             this.wanZhu1 = element;
             this.Monday.wanZu1 = this.wanZhu1.cookcategoryIds.split(",");
             this.Monday.wanZu1 = this.Monday.wanZu1.map((i) => parseInt(i, 0));
             this.Monday.wanZu1Ren = this.wanZhu1.peopleIds.split(",");
-             this.Monday.wanZu1Ren = this.Monday.wanZu1Ren.map((i) => parseInt(i, 0));
+            this.Monday.wanZu1Ren = this.Monday.wanZu1Ren.map((i) =>
+              parseInt(i, 0)
+            );
           } else if (
             element.weeklist === "星期一" &&
             element.timelist === "晚餐" &&
             element.typelist === "副食" &&
-            element.cookcategoryIds !== null &&
-            element.peopleIds !== null
+            element.cookcategoryNames !== null &&
+            element.peopleIds !== ","
           ) {
             this.wanFu1 = element;
             this.Monday.wanFu1 = this.wanFu1.cookcategoryIds.split(",");
             this.Monday.wanFu1 = this.Monday.wanFu1.map((i) => parseInt(i, 0));
             this.Monday.wanFu1Ren = this.wanFu1.peopleIds.split(",");
-             this.Monday.wanFu1Ren = this.Monday.wanFu1Ren.map((i) => parseInt(i, 0));
+            this.Monday.wanFu1Ren = this.Monday.wanFu1Ren.map((i) =>
+              parseInt(i, 0)
+            );
           } else if (
             element.weeklist === "星期二" &&
             element.timelist === "早餐" &&
             element.typelist === "主食" &&
-            element.cookcategoryIds !== null &&
-            element.peopleIds !== null
+            element.cookcategoryNames !== null &&
+            element.peopleIds !== ","
           ) {
             this.zaoZu2 = element;
             this.Tuesday.zaoZu1 = this.zaoZu2.cookcategoryIds.split(",");
@@ -2215,15 +2223,15 @@ export default {
               parseInt(i, 0)
             );
             this.Tuesday.zaoZu1Ren = this.zaoZu2.peopleIds.split(",");
-             this.Tuesday.zaoZu1Ren = this.Tuesday.zaoZu1Ren.map((i) =>
+            this.Tuesday.zaoZu1Ren = this.Tuesday.zaoZu1Ren.map((i) =>
               parseInt(i, 0)
             );
           } else if (
             element.weeklist === "星期二" &&
             element.timelist === "早餐" &&
             element.typelist === "副食" &&
-            element.cookcategoryIds !== null &&
-            element.peopleIds !== null
+            element.cookcategoryNames !== null &&
+            element.peopleIds !== ","
           ) {
             this.zaoFu2 = element;
             this.Tuesday.zaoFu1 = this.zaoFu2.cookcategoryIds.split(",");
@@ -2239,8 +2247,8 @@ export default {
             element.weeklist === "星期二" &&
             element.timelist === "午餐" &&
             element.typelist === "主食" &&
-            element.cookcategoryIds !== null &&
-            element.peopleIds !== null
+            element.cookcategoryNames !== null &&
+            element.peopleIds !== ","
           ) {
             this.zhongZhu2 = element;
             this.Tuesday.zhongZu1 = this.zhongZhu2.cookcategoryIds.split(",");
@@ -2255,8 +2263,8 @@ export default {
             element.weeklist === "星期二" &&
             element.timelist === "午餐" &&
             element.typelist === "副食" &&
-            element.cookcategoryIds !== null &&
-            element.peopleIds !== null
+            element.cookcategoryNames !== null &&
+            element.peopleIds !== ","
           ) {
             this.zhongFu2 = element;
             this.Tuesday.zhongFu1 = this.zhongFu2.cookcategoryIds.split(",");
@@ -2264,15 +2272,15 @@ export default {
               parseInt(i, 0)
             );
             this.Tuesday.zhongFu1Ren = this.zhongFu2.peopleIds.split(",");
-              this.Tuesday.zhongFu1Ren = this.Tuesday.zhongFu1Ren.map((i) =>
+            this.Tuesday.zhongFu1Ren = this.Tuesday.zhongFu1Ren.map((i) =>
               parseInt(i, 0)
             );
           } else if (
             element.weeklist === "星期二" &&
             element.timelist === "晚餐" &&
             element.typelist === "主食" &&
-            element.cookcategoryIds !== null &&
-            element.peopleIds !== null
+            element.cookcategoryNames !== null &&
+            element.peopleIds !== ","
           ) {
             this.wanZhu2 = element;
             this.Tuesday.wanZu1 = this.wanZhu2.cookcategoryIds.split(",");
@@ -2280,15 +2288,15 @@ export default {
               parseInt(i, 0)
             );
             this.Tuesday.wanZu1Ren = this.wanZhu2.peopleIds.split(",");
-             this.Tuesday.wanZu1Ren = this.Tuesday.wanZu1Ren.map((i) =>
+            this.Tuesday.wanZu1Ren = this.Tuesday.wanZu1Ren.map((i) =>
               parseInt(i, 0)
             );
           } else if (
             element.weeklist === "星期二" &&
             element.timelist === "晚餐" &&
             element.typelist === "副食" &&
-            element.cookcategoryIds !== null &&
-            element.peopleIds !== null
+            element.cookcategoryNames !== null &&
+            element.peopleIds !== ","
           ) {
             this.wanFu2 = element;
             this.Tuesday.wanFu1 = this.wanFu2.cookcategoryIds.split(",");
@@ -2296,15 +2304,15 @@ export default {
               parseInt(i, 0)
             );
             this.Tuesday.wanFu1Ren = this.wanFu2.peopleIds.split(",");
-             this.Tuesday.wanFu1Ren = this.Tuesday.wanFu1Ren.map((i) =>
+            this.Tuesday.wanFu1Ren = this.Tuesday.wanFu1Ren.map((i) =>
               parseInt(i, 0)
             );
           } else if (
             element.weeklist === "星期三" &&
             element.timelist === "早餐" &&
             element.typelist === "主食" &&
-            element.cookcategoryIds !== null &&
-            element.peopleIds !== null
+            element.cookcategoryNames !== null &&
+            element.peopleIds !== ","
           ) {
             this.zaoZu3 = element;
             this.Wednesday.zaoZu1 = this.zaoZu3.cookcategoryIds.split(",");
@@ -2312,15 +2320,15 @@ export default {
               parseInt(i, 0)
             );
             this.Wednesday.zaoZu1Ren = this.zaoZu3.peopleIds.split(",");
-              this.Wednesday.zaoZu1Ren = this.Wednesday.zaoZu1Ren.map((i) =>
+            this.Wednesday.zaoZu1Ren = this.Wednesday.zaoZu1Ren.map((i) =>
               parseInt(i, 0)
             );
           } else if (
             element.weeklist === "星期三" &&
             element.timelist === "早餐" &&
             element.typelist === "副食" &&
-            element.cookcategoryIds !== null &&
-            element.peopleIds !== null
+            element.cookcategoryNames !== null &&
+            element.peopleIds !== ","
           ) {
             this.zaoFu3 = element;
             this.Wednesday.zaoFu1 = this.zaoFu3.cookcategoryIds.split(",");
@@ -2335,8 +2343,8 @@ export default {
             element.weeklist === "星期三" &&
             element.timelist === "午餐" &&
             element.typelist === "主食" &&
-            element.cookcategoryIds !== null &&
-            element.peopleIds !== null
+            element.cookcategoryNames !== null &&
+            element.peopleIds !== ","
           ) {
             this.zhongZhu3 = element;
             this.Wednesday.zhongZu1 = this.zhongZhu3.cookcategoryIds.split(",");
@@ -2344,15 +2352,15 @@ export default {
               parseInt(i, 0)
             );
             this.Wednesday.zhongZu1Ren = this.zhongZhu3.peopleIds.split(",");
-             this.Wednesday.zhongZu1Ren = this.Wednesday.zhongZu1Ren.map((i) =>
+            this.Wednesday.zhongZu1Ren = this.Wednesday.zhongZu1Ren.map((i) =>
               parseInt(i, 0)
             );
           } else if (
             element.weeklist === "星期三" &&
             element.timelist === "午餐" &&
             element.typelist === "副食" &&
-            element.cookcategoryIds !== null &&
-            element.peopleIds !== null
+            element.cookcategoryNames !== null &&
+            element.peopleIds !== ","
           ) {
             this.zhongFu3 = element;
             this.Wednesday.zhongFu1 = this.zhongFu3.cookcategoryIds.split(",");
@@ -2360,15 +2368,15 @@ export default {
               parseInt(i, 0)
             );
             this.Wednesday.zhongFu1Ren = this.zhongFu3.peopleIds.split(",");
-              this.Wednesday.zhongFu1Ren = this.Wednesday.zhongFu1Ren.map((i) =>
+            this.Wednesday.zhongFu1Ren = this.Wednesday.zhongFu1Ren.map((i) =>
               parseInt(i, 0)
             );
           } else if (
             element.weeklist === "星期三" &&
             element.timelist === "晚餐" &&
             element.typelist === "主食" &&
-            element.cookcategoryIds !== null &&
-            element.peopleIds !== null
+            element.cookcategoryNames !== null &&
+            element.peopleIds !== ","
           ) {
             this.wanZhu3 = element;
             this.Wednesday.wanZu1 = this.wanZhu3.cookcategoryIds.split(",");
@@ -2376,15 +2384,15 @@ export default {
               parseInt(i, 0)
             );
             this.Wednesday.wanZu1Ren = this.wanZhu3.peopleIds.split(",");
-              this.Wednesday.wanZu1Ren = this.Wednesday.wanZu1Ren.map((i) =>
+            this.Wednesday.wanZu1Ren = this.Wednesday.wanZu1Ren.map((i) =>
               parseInt(i, 0)
             );
           } else if (
             element.weeklist === "星期三" &&
             element.timelist === "晚餐" &&
             element.typelist === "副食" &&
-            element.cookcategoryIds !== null &&
-            element.peopleIds !== null
+            element.cookcategoryNames !== null &&
+            element.peopleIds !== ","
           ) {
             this.wanFu3 = element;
             this.Wednesday.wanFu1 = this.wanFu3.cookcategoryIds.split(",");
@@ -2392,15 +2400,15 @@ export default {
               parseInt(i, 0)
             );
             this.Wednesday.wanFu1Ren = this.wanFu3.peopleIds.split(",");
-             this.Wednesday.wanFu1Ren = this.Wednesday.wanFu1Ren.map((i) =>
+            this.Wednesday.wanFu1Ren = this.Wednesday.wanFu1Ren.map((i) =>
               parseInt(i, 0)
             );
           } else if (
             element.weeklist === "星期四" &&
             element.timelist === "早餐" &&
             element.typelist === "主食" &&
-            element.cookcategoryIds !== null &&
-            element.peopleIds !== null
+            element.cookcategoryNames !== null &&
+            element.peopleIds !== ","
           ) {
             this.zaoZu4 = element;
             this.Thursday.zaoZu1 = this.zaoZu4.cookcategoryIds.split(",");
@@ -2408,15 +2416,15 @@ export default {
               parseInt(i, 0)
             );
             this.Thursday.zaoZu1Ren = this.zaoZu4.peopleIds.split(",");
-             this.Thursday.zaoZu1Ren = this.Thursday.zaoZu1Ren.map((i) =>
+            this.Thursday.zaoZu1Ren = this.Thursday.zaoZu1Ren.map((i) =>
               parseInt(i, 0)
             );
           } else if (
             element.weeklist === "星期四" &&
             element.timelist === "早餐" &&
             element.typelist === "副食" &&
-            element.cookcategoryIds !== null &&
-            element.peopleIds !== null
+            element.cookcategoryNames !== null &&
+            element.peopleIds !== ","
           ) {
             this.zaoFu4 = element;
             this.Thursday.zaoFu1 = this.zaoFu4.cookcategoryIds.split(",");
@@ -2424,15 +2432,15 @@ export default {
               parseInt(i, 0)
             );
             this.Thursday.zaoFu1Ren = this.zaoFu4.peopleIds.split(",");
-              this.Thursday.zaoFu1Ren = this.Thursday.zaoFu1Ren.map((i) =>
+            this.Thursday.zaoFu1Ren = this.Thursday.zaoFu1Ren.map((i) =>
               parseInt(i, 0)
             );
           } else if (
             element.weeklist === "星期四" &&
             element.timelist === "午餐" &&
             element.typelist === "主食" &&
-            element.cookcategoryIds !== null &&
-            element.peopleIds !== null
+            element.cookcategoryNames !== null &&
+            element.peopleIds !== ","
           ) {
             this.zhongZhu4 = element;
             this.Thursday.zhongZu1 = this.zhongZhu4.cookcategoryIds.split(",");
@@ -2440,15 +2448,15 @@ export default {
               parseInt(i, 0)
             );
             this.Thursday.zhongZu1Ren = this.zhongZhu4.peopleIds.split(",");
-              this.Thursday.zhongZu1Ren = this.Thursday.zhongZu1Ren.map((i) =>
+            this.Thursday.zhongZu1Ren = this.Thursday.zhongZu1Ren.map((i) =>
               parseInt(i, 0)
             );
           } else if (
             element.weeklist === "星期四" &&
             element.timelist === "午餐" &&
             element.typelist === "副食" &&
-            element.cookcategoryIds !== null &&
-            element.peopleIds !== null
+            element.cookcategoryNames !== null &&
+            element.peopleIds !== ","
           ) {
             this.zhongFu4 = element;
             this.Thursday.zhongFu1 = this.zhongFu4.cookcategoryIds.split(",");
@@ -2456,15 +2464,15 @@ export default {
               parseInt(i, 0)
             );
             this.Thursday.zhongFu1Ren = this.zhongFu4.peopleIds.split(",");
-              this.Thursday.zhongFu1Ren = this.Thursday.zhongFu1Ren.map((i) =>
+            this.Thursday.zhongFu1Ren = this.Thursday.zhongFu1Ren.map((i) =>
               parseInt(i, 0)
             );
           } else if (
             element.weeklist === "星期四" &&
             element.timelist === "晚餐" &&
             element.typelist === "主食" &&
-            element.cookcategoryIds !== null &&
-            element.peopleIds !== null
+            element.cookcategoryNames !== null &&
+            element.peopleIds !== ","
           ) {
             this.wanZhu4 = element;
             this.Thursday.wanZu1 = this.wanZhu4.cookcategoryIds.split(",");
@@ -2479,8 +2487,8 @@ export default {
             element.weeklist === "星期四" &&
             element.timelist === "晚餐" &&
             element.typelist === "副食" &&
-            element.cookcategoryIds !== null &&
-            element.peopleIds !== null
+            element.cookcategoryNames !== null &&
+            element.peopleIds !== ","
           ) {
             this.wanFu4 = element;
             this.Thursday.wanFu1 = this.wanFu4.cookcategoryIds.split(",");
@@ -2488,39 +2496,43 @@ export default {
               parseInt(i, 0)
             );
             this.Thursday.wanFu1Ren = this.wanFu4.peopleIds.split(",");
-             this.Thursday.wanFu1Ren = this.Thursday.wanFu1Ren.map((i) =>
+            this.Thursday.wanFu1Ren = this.Thursday.wanFu1Ren.map((i) =>
               parseInt(i, 0)
             );
           } else if (
             element.weeklist === "星期五" &&
             element.timelist === "早餐" &&
             element.typelist === "主食" &&
-            element.cookcategoryIds !== null &&
-            element.peopleIds !== null
+            element.cookcategoryNames !== null &&
+            element.peopleIds !== ","
           ) {
             this.zaoZu5 = element;
             this.Friday.zaoZu1 = this.zaoZu5.cookcategoryIds.split(",");
             this.Friday.zaoZu1 = this.Friday.zaoZu1.map((i) => parseInt(i, 0));
             this.Friday.zaoZu1Ren = this.zaoZu5.peopleIds.split(",");
-                this.Friday.zaoZu1Ren = this.Friday.zaoZu1Ren.map((i) => parseInt(i, 0));
+            this.Friday.zaoZu1Ren = this.Friday.zaoZu1Ren.map((i) =>
+              parseInt(i, 0)
+            );
           } else if (
             element.weeklist === "星期五" &&
             element.timelist === "早餐" &&
             element.typelist === "副食" &&
-            element.cookcategoryIds !== null &&
-            element.peopleIds !== null
+            element.cookcategoryNames !== null &&
+            element.peopleIds !== ","
           ) {
             this.zaoFu5 = element;
             this.Friday.zaoFu1 = this.zaoFu5.cookcategoryIds.split(",");
             this.Friday.zaoFu1 = this.Friday.zaoFu1.map((i) => parseInt(i, 0));
             this.Friday.zaoFu1Ren = this.zaoFu5.peopleIds.split(",");
-             this.Friday.zaoFu1Ren = this.Friday.zaoFu1Ren.map((i) => parseInt(i, 0));
+            this.Friday.zaoFu1Ren = this.Friday.zaoFu1Ren.map((i) =>
+              parseInt(i, 0)
+            );
           } else if (
             element.weeklist === "星期五" &&
             element.timelist === "午餐" &&
             element.typelist === "主食" &&
-            element.cookcategoryIds !== null &&
-            element.peopleIds !== null
+            element.cookcategoryNames !== null &&
+            element.peopleIds !== ","
           ) {
             this.zhongZhu5 = element;
             this.Friday.zhongZu1 = this.zhongZhu5.cookcategoryIds.split(",");
@@ -2528,15 +2540,15 @@ export default {
               parseInt(i, 0)
             );
             this.Friday.zhongZu1Ren = this.zhongZhu5.peopleIds.split(",");
-             this.Friday.zhongZu1Ren = this.Friday.zhongZu1Ren.map((i) =>
+            this.Friday.zhongZu1Ren = this.Friday.zhongZu1Ren.map((i) =>
               parseInt(i, 0)
             );
           } else if (
             element.weeklist === "星期五" &&
             element.timelist === "午餐" &&
             element.typelist === "副食" &&
-            element.cookcategoryIds !== null &&
-            element.peopleIds !== null
+            element.cookcategoryNames !== null &&
+            element.peopleIds !== ","
           ) {
             this.zhongFu5 = element;
             this.Friday.zhongFu1 = this.zhongFu5.cookcategoryIds.split(",");
@@ -2544,7 +2556,7 @@ export default {
               parseInt(i, 0)
             );
             this.Friday.zhongFu1Ren = this.zhongFu5.peopleIds.split(",");
-             this.Friday.zhongFu1Ren = this.Friday.zhongFu1Ren.map((i) =>
+            this.Friday.zhongFu1Ren = this.Friday.zhongFu1Ren.map((i) =>
               parseInt(i, 0)
             );
           } else if (
@@ -2552,31 +2564,35 @@ export default {
             element.timelist === "晚餐" &&
             element.typelist === "主食" &&
             element.cookcategoryNames !== null &&
-            element.peopleIds !== null
+            element.peopleIds !== ","
           ) {
             this.wanZhu5 = element;
             this.Friday.wanZu1 = this.wanZhu5.cookcategoryIds.split(",");
             this.Friday.wanZu1 = this.Friday.wanZu1.map((i) => parseInt(i, 0));
             this.Friday.wanZu1Ren = this.wanZhu5.peopleIds.split(",");
-             this.Friday.wanZu1Ren = this.Friday.wanZu1Ren.map((i) => parseInt(i, 0));
+            this.Friday.wanZu1Ren = this.Friday.wanZu1Ren.map((i) =>
+              parseInt(i, 0)
+            );
           } else if (
             element.weeklist === "星期五" &&
             element.timelist === "晚餐" &&
             element.typelist === "副食" &&
-            element.cookcategoryIds !== null &&
-            element.peopleIds !== null
+            element.cookcategoryNames !== null &&
+            element.peopleIds !== ","
           ) {
             this.wanFu5 = element;
             this.Friday.wanFu1 = this.wanFu5.cookcategoryIds.split(",");
             this.Friday.wanFu1 = this.Friday.wanFu1.map((i) => parseInt(i, 0));
             this.Friday.wanFu1Ren = this.wanFu5.peopleIds.split(",");
-             this.Friday.wanFu1Ren = this.Friday.wanFu1Ren.map((i) => parseInt(i, 0));
+            this.Friday.wanFu1Ren = this.Friday.wanFu1Ren.map((i) =>
+              parseInt(i, 0)
+            );
           } else if (
             element.weeklist === "星期六" &&
             element.timelist === "早餐" &&
             element.typelist === "主食" &&
-            element.cookcategoryIds !== null &&
-            element.peopleIds !== null
+            element.cookcategoryNames !== null &&
+            element.peopleIds !== ","
           ) {
             this.zaoZu6 = element;
             this.Saturday.zaoZu1 = this.zaoZu6.cookcategoryIds.split(",");
@@ -2584,15 +2600,15 @@ export default {
               parseInt(i, 0)
             );
             this.Saturday.zaoZu1Ren = this.zaoZu6.peopleIds.split(",");
-             this.Saturday.zaoZu1Ren = this.Saturday.zaoZu1Ren.map((i) =>
+            this.Saturday.zaoZu1Ren = this.Saturday.zaoZu1Ren.map((i) =>
               parseInt(i, 0)
             );
           } else if (
             element.weeklist === "星期六" &&
             element.timelist === "早餐" &&
             element.typelist === "副食" &&
-            element.cookcategoryIds !== null &&
-            element.peopleIds !== null
+            element.cookcategoryNames !== null &&
+            element.peopleIds !== ","
           ) {
             this.zaoFu6 = element;
             this.Saturday.zaoFu1 = this.zaoFu6.cookcategoryIds.split(",");
@@ -2600,15 +2616,15 @@ export default {
               parseInt(i, 0)
             );
             this.Saturday.zaoFu1Ren = this.zaoFu6.peopleIds.split(",");
-              this.Saturday.zaoFu1Ren = this.Saturday.zaoFu1Ren.map((i) =>
+            this.Saturday.zaoFu1Ren = this.Saturday.zaoFu1Ren.map((i) =>
               parseInt(i, 0)
             );
           } else if (
             element.weeklist === "星期六" &&
             element.timelist === "午餐" &&
             element.typelist === "主食" &&
-            element.cookcategoryIds !== null &&
-            element.peopleIds !== null
+            element.cookcategoryNames !== null &&
+            element.peopleIds !== ","
           ) {
             this.zhongZhu6 = element;
             this.Saturday.zhongZu1 = this.zhongZhu6.cookcategoryIds.split(",");
@@ -2623,8 +2639,8 @@ export default {
             element.weeklist === "星期六" &&
             element.timelist === "午餐" &&
             element.typelist === "副食" &&
-            element.cookcategoryIds !== null &&
-            element.peopleIds !== null
+            element.cookcategoryNames !== null &&
+            element.peopleIds !== ","
           ) {
             this.zhongFu6 = element;
             this.Saturday.zhongFu1 = this.zhongFu6.cookcategoryIds.split(",");
@@ -2632,15 +2648,15 @@ export default {
               parseInt(i, 0)
             );
             this.Saturday.zhongFu1Ren = this.zhongFu6.peopleIds.split(",");
-             this.Saturday.zhongFu1Ren = this.Saturday.zhongFu1Ren.map((i) =>
+            this.Saturday.zhongFu1Ren = this.Saturday.zhongFu1Ren.map((i) =>
               parseInt(i, 0)
             );
           } else if (
             element.weeklist === "星期六" &&
             element.timelist === "晚餐" &&
             element.typelist === "主食" &&
-            element.cookcategoryIds !== null &&
-            element.peopleIds !== null
+            element.cookcategoryNames !== null &&
+            element.peopleIds !== ","
           ) {
             this.wanZhu6 = element;
             this.Saturday.wanZu1 = this.wanZhu6.cookcategoryIds.split(",");
@@ -2655,8 +2671,8 @@ export default {
             element.weeklist === "星期六" &&
             element.timelist === "晚餐" &&
             element.typelist === "副食" &&
-            element.cookcategoryIds !== null &&
-            element.peopleIds !== null
+            element.cookcategoryNames !== null &&
+            element.peopleIds !== ","
           ) {
             this.wanFu6 = element;
             this.Saturday.wanFu1 = this.wanFu6.cookcategoryIds.split(",");
@@ -2664,39 +2680,43 @@ export default {
               parseInt(i, 0)
             );
             this.Saturday.wanFu1Ren = this.wanFu6.peopleIds.split(",");
-             this.Saturday.wanFu1Ren = this.Saturday.wanFu1Ren.map((i) =>
+            this.Saturday.wanFu1Ren = this.Saturday.wanFu1Ren.map((i) =>
               parseInt(i, 0)
             );
           } else if (
             element.weeklist === "星期日" &&
             element.timelist === "早餐" &&
             element.typelist === "主食" &&
-            element.cookcategoryIds !== null &&
-            element.peopleIds !== null
+            element.cookcategoryNames !== null &&
+            element.peopleIds !== ","
           ) {
             this.zaoZu7 = element;
             this.Sunday.zaoZu1 = this.zaoZu7.cookcategoryIds.split(",");
             this.Sunday.zaoZu1 = this.Sunday.zaoZu1.map((i) => parseInt(i, 0));
             this.Sunday.zaoZu1Ren = this.zaoZu7.peopleIds.split(",");
-             this.Sunday.zaoZu1Ren = this.Sunday.zaoZu1Ren.map((i) => parseInt(i, 0));
+            this.Sunday.zaoZu1Ren = this.Sunday.zaoZu1Ren.map((i) =>
+              parseInt(i, 0)
+            );
           } else if (
             element.weeklist === "星期日" &&
             element.timelist === "早餐" &&
             element.typelist === "副食" &&
-            element.cookcategoryIds !== null &&
-            element.peopleIds !== null
+            element.cookcategoryNames !== null &&
+            element.peopleIds !== ","
           ) {
             this.zaoFu7 = element;
             this.Sunday.zaoFu1 = this.zaoFu7.cookcategoryIds.split(",");
             this.Sunday.zaoFu1 = this.Sunday.zaoFu1.map((i) => parseInt(i, 0));
             this.Sunday.zaoFu1Ren = this.zaoFu7.peopleIds.split(",");
-             this.Sunday.zaoFu1Ren = this.Sunday.zaoFu1Ren.map((i) => parseInt(i, 0));
+            this.Sunday.zaoFu1Ren = this.Sunday.zaoFu1Ren.map((i) =>
+              parseInt(i, 0)
+            );
           } else if (
             element.weeklist === "星期日" &&
             element.timelist === "午餐" &&
             element.typelist === "主食" &&
-            element.cookcategoryIds !== null &&
-            element.peopleIds !== null
+            element.cookcategoryNames !== null &&
+            element.peopleIds !== ","
           ) {
             this.zhongZhu7 = element;
             this.Sunday.zhongZu1 = this.zhongZhu7.cookcategoryIds.split(",");
@@ -2704,16 +2724,15 @@ export default {
               parseInt(i, 0)
             );
             this.Sunday.zhongZu1Ren = this.zhongZhu7.peopleIds.split(",");
-               this.Sunday.zhongZu1Ren = this.Sunday.zhongZu1Ren.map((i) =>
+            this.Sunday.zhongZu1Ren = this.Sunday.zhongZu1Ren.map((i) =>
               parseInt(i, 0)
             );
-            
           } else if (
             element.weeklist === "星期日" &&
             element.timelist === "午餐" &&
             element.typelist === "副食" &&
-            element.cookcategoryIds !== null &&
-            element.peopleIds !== null
+            element.cookcategoryNames !== null &&
+            element.peopleIds !== ","
           ) {
             this.zhongFu7 = element;
             this.Sunday.zhongFu1 = this.zhongFu7.cookcategoryIds.split(",");
@@ -2721,33 +2740,37 @@ export default {
               parseInt(i, 0)
             );
             this.Sunday.zhongFu1Ren = this.zhongFu7.peopleIds.split(",");
-             this.Sunday.zhongFu1Ren = this.Sunday.zhongFu1Ren.map((i) =>
+            this.Sunday.zhongFu1Ren = this.Sunday.zhongFu1Ren.map((i) =>
               parseInt(i, 0)
             );
           } else if (
             element.weeklist === "星期日" &&
             element.timelist === "晚餐" &&
             element.typelist === "主食" &&
-            element.cookcategoryIds !== null &&
-            element.peopleIds !== null
+            element.cookcategoryNames !== null &&
+            element.peopleIds !== ","
           ) {
             this.wanZhu7 = element;
             this.Sunday.wanZu1 = this.wanZhu7.cookcategoryIds.split(",");
             this.Sunday.wanZu1 = this.Sunday.wanZu1.map((i) => parseInt(i, 0));
             this.Sunday.wanZu1Ren = this.wanZhu7.peopleIds.split(",");
-            this.Sunday.wanZu1Ren = this.Sunday.wanZu1Ren.map((i) => parseInt(i, 0));
+            this.Sunday.wanZu1Ren = this.Sunday.wanZu1Ren.map((i) =>
+              parseInt(i, 0)
+            );
           } else if (
             element.weeklist === "星期日" &&
             element.timelist === "晚餐" &&
             element.typelist === "副食" &&
-            element.cookcategoryIds !== null &&
-            element.peopleIds !== null
+            element.cookcategoryNames !== null &&
+            element.peopleIds !== ","
           ) {
             this.wanFu7 = element;
             this.Sunday.wanFu1 = this.wanFu7.cookcategoryIds.split(",");
             this.Sunday.wanFu1 = this.Sunday.wanFu1.map((i) => parseInt(i, 0));
             this.Sunday.wanFu1Ren = this.wanFu7.peopleIds.split(",");
-             this.Sunday.wanFu1Ren = this.Sunday.wanFu1Ren.map((i) => parseInt(i, 0));
+            this.Sunday.wanFu1Ren = this.Sunday.wanFu1Ren.map((i) =>
+              parseInt(i, 0)
+            );
           }
         });
       });

src/views/grassrootsregistration/bdgldiary/index.vue

@@ -834,16 +834,6 @@ export default {
       list: [],
       // 下拉选项显示隐藏
       xiaLa: false,
-      // 查铺查岗数组
-      // checkShop: [
-      //   {
-      //     peopleName: null,
-      //     foremanName: null,
-      //     sentryName: null,
-      //     examineDate: null,
-      //     dialogue: null,
-      //   },
-      // ],
       //添加对话框查铺表格为空
       checkShop: [
         {
@@ -1019,7 +1009,6 @@ export default {
     blogDate() {
       // 判断是否全部选择
       if (this.form.unitId !== null && this.form.blogDate !== null) {
-        console.log(333);
         this.XunLian(this.form.unitId, this.form.blogDate);
       }
     },
@@ -1044,9 +1033,7 @@ export default {
       this.getRenYuan(this.form.unitId);
       this.getShou(this.form.unitId);
       // 判断是否全部选择
-      console.log(1111);
       if (this.form.unitId !== null && this.form.blogDate) {
-        console.log(222);
         this.XunLian(this.form.unitId, this.form.blogDate);
       }
     },

src/views/grassrootsregistration/bdglweekwork/index.vue

@@ -190,7 +190,7 @@
       <div class="jiben">基本信息</div>
 
       <el-form
-        ref="form"
+        ref="refform"
         :model="form"
         :rules="rules"
         label-width="80px"
@@ -503,8 +503,8 @@ export default {
       form: {},
       // 表单校验
       rules: {
-        deptId: [
-          // { required: true, message: "单位名称不能为空", trigger: "blur" },
+        peopleId: [
+          { required: true, message: "单位名称不能为空", trigger: "blur" },
         ],
       },
       //下拉s
@@ -600,7 +600,7 @@ export default {
         deteline: null,
         startTime: null,
         endTime: null,
-        unitId1: null,
+        unitId1: this.form.unitName,
         peopleIds: null,
         address: null,
         contents: null,
@@ -655,9 +655,9 @@ export default {
     },
     // 选中单位触发
     department(data) {
-      console.log(data);
       this.ChongZhi();
       this.form.unitId = data.id;
+      this.form.unitName=data.label
       this.ZhuChiRen(this.form.unitId);
       this.tomList.forEach((item, i) => {
         console.log(item);
@@ -727,7 +727,7 @@ export default {
           contents: null,
         },
       ]),
-        this.resetForm("form");
+        this.resetForm("refform");
     },
     /** 搜索按钮操作 */
     handleQuery() {
@@ -759,6 +759,7 @@ export default {
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
+      
       this.reset();
       this.getTreeselect();
       this.form.unitId = row.unitId;
@@ -787,7 +788,7 @@ export default {
 
     /** 提交按钮 */
     submitForm() {
-      this.$refs["form"].validate((valid) => {
+      this.$refs['form'][0].validate((valid) => {
         if (valid) {
           this.form.bdglWeekworkRegisterList = this.tomList;
           if (this.form.id != null) {