Merge branch 'develop' of http://117.78.60.236:8000/csbr-daop/fe-data-asset-management into develop

@@ -189,6 +189,8 @@ const fieldItemList = ref([
     clearable: true,
   },
 ]);
+
+const checked1 = ref(false);
 const tableToolRef = ref();
 const toolH = ref(49);
 const page = ref({
@@ -389,6 +391,7 @@ const getTaskDetail = (param) => {
       })
     } else {
       ElMessage.error(res.msg);
+      loading.value = false;
     }
   }).catch(() => {
     loading.value = false;
@@ -403,7 +406,10 @@ const getFieldCount = () => {
       fieldCounts.value = data;
     } else {
       ElMessage.error(res.msg);
+      loading.value = false;
     }
+  }).catch(() => {
+    loading.value = false;
   })
 }
 
@@ -419,15 +425,17 @@ const getGradeData = () => {
       fieldTableInfo.value.fields[5].options = JSON.parse(JSON.stringify(data));
     } else {
       ElMessage.error(res.msg);
+      loading.value = false;
     }
+  }).catch(() => {
+    loading.value = false;
   })
 }
 
 // 获取分类树形数据
 const getFieldTree = () => {
-  treeInfo.value.loading = true;
   getTaskExeTreeList({ execGuid: taskDetail.value.execGuid }).then((res: any) => {
-    treeInfo.value.loading = false;
+    // treeInfo.value.loading = false;
     if (res.code == proxy.$passCode) {
       const data = res.data || [];
       const children: any = [
@@ -443,15 +451,16 @@ const getFieldTree = () => {
       fieldTableInfo.value.fields[4].options = JSON.parse(JSON.stringify(data));
     } else {
       ElMessage.error(res.msg);
+      loading.value = false;
     }
   }).catch(() => {
-    treeInfo.value.loading = false;
+    loading.value = false;
   })
 }
 
 // 获取库、表、字段信息
 const getSheetFieldList = (params, tId = null) => {
-  getDbFieldList({ execGuid: taskDetail.value.execGuid, ...params }).then(res => {
+  getDbFieldList({ execGuid: taskDetail.value.execGuid, ...params }).then((res: any) => {
     if (res.code == proxy.$passCode) {
       const data = res.data || [];
       if (params.type == 1) {
@@ -473,7 +482,10 @@ const getSheetFieldList = (params, tId = null) => {
       }
     } else {
       ElMessage.error(res.msg);
+      loading.value = false;
     }
+  }).catch(() => {
+    loading.value = false;
   })
 }
 
@@ -497,7 +509,7 @@ const nodeClick = (data, node) => {
 
 // 获取库表数据
 const getSheetTableData = () => {
-  sheetTableInfo.value.loading = true;
+  loading.value = true;
   const sheetParams = sheetSearchRef.value.toolSearch.formInline || {};
   execTaskSheetList(
     Object.assign({}, { ...sheetParams }, {
@@ -506,7 +518,7 @@ const getSheetTableData = () => {
       pageSize: sheetTableInfo.value.page.limit,
     })
   ).then((res: any) => {
-    sheetTableInfo.value.loading = false;
+    loading.value = false;
     if (res.code == proxy.$passCode) {
       sheetTableInfo.value.data = res.data.records || [];
       sheetTableInfo.value.page.curr = res.data.pageIndex;
@@ -517,19 +529,20 @@ const getSheetTableData = () => {
     }
   })
     .catch((res) => {
-      fieldTableInfo.value.loading = false;
+      loading.value = false;
     });
 };
 
 // 获取字段表格数据
 const getFieldTableData = () => {
-  fieldTableInfo.value.loading = true;
+  loading.value = true;
   const fieldParams = fieldSearchRef.value.toolSearch.formInline || {};
   let params: any = {
     ...fieldParams,
     execGuid: taskDetail.value.execGuid,
     pageIndex: fieldTableInfo.value.page.curr,
     pageSize: fieldTableInfo.value.page.limit,
+    isMergeClassify: checked1.value ? 'Y' : 'N'
   }
   const classifyName = params.classifyName?.at(-1) || undefined;
   params.isClassify = classifyName === undefined ? '' : classifyName == 'unclassified' ? 'N' : 'Y';
@@ -538,7 +551,7 @@ const getFieldTableData = () => {
   }
   delete params.classifyName
   execTaskFieldList(params).then((res: any) => {
-    fieldTableInfo.value.loading = false;
+    loading.value = false;
     if (res.code == proxy.$passCode) {
       let data = res.data.records || [];
       data.map(item => item.STATE = '');
@@ -551,7 +564,7 @@ const getFieldTableData = () => {
     }
   })
     .catch((res) => {
-      fieldTableInfo.value.loading = false;
+      loading.value = false;
     });
 };
 
@@ -630,6 +643,7 @@ const btnClick = async (btn, bType = null) => {
       ElMessage.warning('请选择需要操作的数据');
       return
     }
+    formItems.value.map(f => f.default = f.field == 'gradeGuid' ? '' : []);
     dialogInfo.value.visible = true;
   } else if (type == 'cancel') {
     router.push({
@@ -637,24 +651,24 @@ const btnClick = async (btn, bType = null) => {
     });
   } else if (type == 'confirm') {
     saveTask();
-  } else if(type == 'status'){
+  } else if (type == 'status') {
     if (selectRowData.value.length == 0) {
       ElMessage.warning('请选择需要操作的数据');
     } else {
-      let toChange = true, params:any = [];
+      let toChange = true, params: any = [];
       selectRowData.value.map((item: any) => {
-        if(!item.classifyDetailGuid || !item.gradeDetailGuid){
-          toChange=false
+        if (!item.classifyDetailGuid || !item.gradeDetailGuid) {
+          toChange = false
         }
         params.push(item.guid)
       })
-      if(!toChange){
+      if (!toChange) {
         ElMessage.warning('所选数据分类分级均不能为空');
         return
       }
       saveStatus(params);
     }
-  } else if(type == 'export'){
+  } else if (type == 'export') {
 
   }
 };
@@ -666,7 +680,7 @@ const saveFields = (params, isBatch = false) => {
     loading.value = false;
     if (res.code == proxy.$passCode) {
       ElMessage.success('保存成功');
-      if(isBatch){
+      if (isBatch) {
         getFieldTableData();
       } else {
         currTableData.value.changeStatus = 'Y';
@@ -723,6 +737,8 @@ const searchSheet = (val: any, clear: boolean = false) => {
 const searchField = (val: any, clear: boolean = false) => {
   if (clear) {
     fieldItemList.value.map(item => item.default = '')
+    treeInfo.value.expandedKey = ['all'];
+    treeInfoRef.value.setCurrentKey('all');
   }
   fieldParams.value = Object.assign({}, { ...fieldParams.value }, { ...val });
   getFieldTableData();
@@ -935,6 +951,9 @@ onMounted(() => {
                     <el-button type="primary" plain @click="btnClick({ value: 'status' })">批量确认</el-button>
                     <el-button plain @click="btnClick({ value: 'export' })">导出</el-button>
                   </div>
+                  <div class="checkboxs">
+                    <el-checkbox v-model="checked1" @change="getFieldTableData()">仅看多分级分类</el-checkbox>
+                  </div>
                 </div>
               </div>
               <div class="table_panel_wrap panel" :style="{ height: 'calc(100% - ' + toolH + 'px)' }">