Merge branch 'qingban' of http://113.44.0.55:8014/jiaxiaoqiang/JG-ADMIN-TEMP into qingban

src/views/base/craftManagement/route/components/groupProcess.vue

@@ -141,7 +141,7 @@ const changeChecked = (key: string) => {
         <el-button @click="addGroup" type="primary">添加分组</el-button>
       </el-row>
 
-      <div v-for="key in Object.keys(groupData)" :key="key">
+      <div v-for="key in new Map(Object.entries(groupData)).keys()" :key="key">
         <div class="name-container">
           <div class="group-name">{{ key }}</div>
           <el-button link type="danger" @click="() => delete groupData[key]"

src/views/quality/reject/index.vue

@@ -1,5 +1,9 @@
 <template>
   <div class="mainContentBox">
+    <el-tabs v-model="activeName" type="card">
+      <el-tab-pane label="待处理" name="no"/>
+      <el-tab-pane label="审核完成" name="ok"/>
+    </el-tabs>
     <avue-crud
       ref="crudRef"
       v-model:search="search"
@@ -114,10 +118,23 @@ const openCheckView = (row) => {
   row.businessId = row.id
   workFlowCheckRef.value && workFlowCheckRef.value.openDialog(row, "removeService");
 };
+const activeName = ref("no");
 onMounted(() => {
   search.value.type = "eliminate";
+  search.value.isOk = "0";
   dataList();
 });
+watch(
+  () => activeName.value,
+  (val) => {
+    if (val == "ok") {
+      search.value.isOk = "1";
+    } else {
+      search.value.isOk = "0";
+    }
+    dataList();
+  }
+);
 
 const onWFSave = (flowForm) => {
   submitFlow(flowForm).then(() => {