Merge branch 'dev' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend-mes into dengfei

src/views/batchRecord/components/plan.vue

@@ -145,7 +145,13 @@
             minWidth: 110,
             formatter: (row) => {
               if (row.type == 0) {
-                return row.executeUser.map((i) => i.groupName).join(',');
+                return [
+                  ...new Set(
+                    (row.executeUser || [])
+                      .map((i) => i.groupName)
+                      .filter((i) => i)
+                  )
+                ].join(',');
               }
               return '';
             }

src/views/batchRecord/components/workOrder.vue

@@ -115,7 +115,7 @@
             minWidth: 110,
             formatter: (row) => {
               if (row.planExecuteType == 0) {
-                return row.executeUsers.map((i) => i.groupName).join(',');
+                return Array.from(new Set((row.executeUsers || []).map(i => i.groupName).filter(v => v))).join(',');
               }
               return '';
             }

src/views/produce/components/prenatalExamination/releaseRulesDialog.vue

@@ -1285,6 +1285,7 @@
         } else {
           this.addForm.executeUsersIds = [];
         }
+        this.computedDuration();
       },
       // 计算工时
       computedDuration() {