结果确认字段查询添加参数

@@ -99,7 +99,7 @@ const getTableData = () => {
     if (res.code == proxy.$passCode) {
       let data = res.data.records || [];
       data.map(item => {
-        item.cellClass = item.confirmCnt>0?'':'is-regular'
+        item.cellClass = item.confirmCnt > 0 ? '' : 'is-regular'
       })
       tableInfo.value.data = data;
     } else {
@@ -223,7 +223,13 @@ onBeforeMount(() => {
 <template>
   <div class="container_wrap" v-loading="loading">
     <div class="table_tool_wrap" v-if="tableInfo.data.length">
-      <div class="table_title">分类分级任务</div>
+      <div class="table_title">
+        <span>分类分级任务</span>
+        <div class="title_tool">
+          <el-button @click="getTableData" v-preReClick>刷新结果</el-button>
+          <span class="tips_text">请及时刷新查看最终结果</span>
+        </div>
+      </div>
     </div>
     <div class="table_panel_wrap" v-if="tableInfo.data.length">
       <Table :tableInfo="tableInfo" @tableBtnClick="tableBtnClick" />
@@ -247,6 +253,19 @@ onBeforeMount(() => {
     font-weight: 600;
     font-size: 16px;
     color: #212121;
+    display: flex;
+
+    .title_tool {
+      display: flex;
+      margin-left: 16px;
+      align-items: center;
+
+      .tips_text {
+        margin-left: 16px;
+        font-size: 14px;
+        color: #b2b2b2;
+      }
+    }
   }
 }
 

@@ -157,6 +157,22 @@ const fieldItemList = ref([
     disabled: true
   },
   {
+    type: "select",
+    label: "",
+    placeholder: '分类情况',
+    field: 'isClassify',
+    default: '',
+    options: [
+      { label: '已分类', value: 'Y' },
+      { label: '未分类', value: 'N' },
+    ],
+    props: {
+      // label: 'name',
+      // value: 'dbGuid'
+    },
+    clearable: true,
+  },
+  {
     type: "cascader",
     label: "",
     placeholder: '分类',
@@ -437,17 +453,13 @@ const getFieldTree = () => {
   getTaskExeTreeList({ execGuid: taskDetail.value.execGuid }).then((res: any) => {
     // treeInfo.value.loading = false;
     if (res.code == proxy.$passCode) {
-      const data = res.data || [];
-      const children: any = [
-        { classifyName: '未分类', classifyDetailGuid: 'unclassified' },
-        ...data
-      ]
-      treeData.value[0].children = children;
+      const data: any = res.data || [];
+      treeData.value[0].children.push(...data);
       treeInfo.value.data = treeData.value;
       treeInfo.value.expandedKey = ['all'];
       treeInfoRef.value.setCurrentKey('all');
       formItems.value[0].options = JSON.parse(JSON.stringify(data));
-      fieldItemList.value[4].options = JSON.parse(JSON.stringify(children));
+      fieldItemList.value[5].options = JSON.parse(JSON.stringify(data));
       fieldTableInfo.value.fields[4].options = JSON.parse(JSON.stringify(data));
     } else {
       ElMessage.error(res.msg);
@@ -496,13 +508,14 @@ const tabChange = (val) => {
 const nodeClick = (data, node) => {
   currTreeNode.value = data;
   if (data.classifyDetailGuid == 'all') {
-    fieldItemList.value[4].default = [];
+    fieldItemList.value[4].default = '';
+    fieldItemList.value[5].default = [];
     getFieldTableData()
   } else {
     const parentGuids = data.parentGuids || [];
     parentGuids.push(data.classifyDetailGuid)
-    fieldItemList.value[4].default = parentGuids;
-    console.log('tree', parentGuids)
+    fieldItemList.value[4].default = 'Y';
+    fieldItemList.value[5].default = parentGuids;
     getFieldTableData();
   }
 }
@@ -545,7 +558,7 @@ const getFieldTableData = () => {
     isMergeClassify: checked1.value ? 'Y' : 'N'
   }
   const classifyName = params.classifyName?.at(-1) || undefined;
-  params.isClassify = classifyName === undefined ? '' : classifyName == 'unclassified' ? 'N' : 'Y';
+  // params.isClassify = classifyName === undefined ? '' : classifyName == 'unclassified' ? 'N' : 'Y';
   if (classifyName && classifyName != 'unclassified') {
     params.classifyDetail = classifyName;
   }
@@ -768,7 +781,7 @@ const selectChange = (val, item, scope = null) => {
     let row = scope.row;
     row.gradeGuid = val || '';
     row.gradeDetailName = val ? item.options.find(i => i.guid == val)?.gradeName : '';
-  } else {
+  } else if (item.field == 'databaseGuid' || item.field == 'tableGuid') {
     const params: any = scope;
     if (tabsInfo.value.activeName == 'sheet') {
       if (!val) {
@@ -809,7 +822,7 @@ const selectChange = (val, item, scope = null) => {
         params.fieldGuid = '';
       }
 
-      if (val && item.field != "fieldGuid") {
+      if (val) {
         const params = {
           type: item.field == "databaseGuid" ? 2 : 3,
           dbGuid: val || ''
@@ -817,6 +830,13 @@ const selectChange = (val, item, scope = null) => {
         getSheetFieldList(params)
       }
     }
+  } else if (item.field == 'isClassify') {
+    fieldItemList.value[5].default = [];
+    fieldItemList.value[6].default = '';
+    treeInfo.value.expandedKey = ['all'];
+    treeInfoRef.value.setCurrentKey('all');
+    fieldItemList.value[4].default = val || '';
+    getFieldTableData();
   }
 }
 
@@ -954,7 +974,7 @@ onMounted(() => {
                     <el-button plain @click="btnClick({ value: 'export' })">导出</el-button>
                   </div>
                   <div class="checkboxs">
-                    <el-checkbox v-model="checked1" @change="getFieldTableData()">仅看多分级分类</el-checkbox>
+                    <el-checkbox v-model="checked1" @change="getFieldTableData()">仅看多分类</el-checkbox>
                   </div>
                 </div>
               </div>