Merge branch 'develop' into release-test

@@ -346,6 +346,12 @@ onMounted(() => {
         <template #default="scope" v-else-if="item.type == 'input'">
           <el-input v-model.trim="scope.row[item.field]" placeholder="请输入" :maxlength="item.maxlength ?? ''"></el-input>
         </template>
+        <template #default="scope" v-else-if="item.type == 'approveTag'">
+          <el-tag v-if="scope.row[item.field]" :type="tagType(scope.row.approveVO, 'approveState')">{{
+            tagMethod(scope.row.approveVO, 'approveState')
+          }}</el-tag>
+          <span v-else>{{ '--' }}</span>
+        </template>
         <template #default="scope" v-else-if="item.type == 'tooltip'">
           <el-tooltip :placement="item.placement ?? 'bottom-start'" effect="light" popper-class="table_tooltip"
             :trigger="item.trigger">

@@ -149,8 +149,8 @@ header {
     background-color: inherit;
 
     .logo {
-      width: auto;
-      height: 30px;
+      width: 180px;
+      height: 48px;
     }
 
     span {
@@ -278,5 +278,4 @@ header {
     height: 18px;
   }
 }
-
 </style>

@@ -723,7 +723,7 @@ export const tagMethod = (row, type) => {
         tag = '已撤销'
         break;
       default:
-        tag = row['dataState'] === 1 ? '已提交' : '草稿中'
+        tag = '--'
         break;
     }
   } else if (type == 'standardType') {

@@ -36,7 +36,7 @@ const tableFields = ref([
   { label: "登记时间", field: "registerTime", width: 120 },
   //   { label: "企业名称", field: "tenantName", width: 240, align: "left" },
   { label: "评估机构", field: "issuingEntityName", width: 250, align: "left" },
-  { label: "状态", field: "approveState", type: "tag", width: 96, align: 'center' },
+  { label: "审批状态", field: "approveVO", type: "approveTag", width: 96, align: 'center' },
 ]);
 
 const deploymentId = ref('');
@@ -177,10 +177,10 @@ const tableInfo = ref({
 const getTableBtns = (row) => {
   let btnsArr: any[] = [];
   const approveVO = row.approveVO || {};
-  const approveState = row.approveState || null;
+  const approveState = row.approveVO.approveState || null;
   const approveStaffGuids = approveVO.approveStaffGuids || [];
   const staffGuid = approveVO.staffGuid || '';
-  const bizApproveState = row.bizApproveState;
+  const bizApproveState = row.approveState;
   const currentStaffGuid = userData.staffGuid
   let isShowCancel = false;
   let flowState;

@@ -346,8 +346,8 @@ const handleWindowResize = () => {
     </div>
     <div class="table_panel_wrap" :style="{ height: `calc(100% - ${tableToolsHeight + 60}px)` }">
       <div class="data-content" v-loading="listDataLoading" :style="{ height: `calc(100% - ${tableToolsHeight}px)` }">
-        <div class="v-add" @click.stop="handleCreate" v-if="listData.length">
-          <div class="add-img"></div>
+        <div class="v-add" @click.stop="handleCreate">
+          <div class=" add-img"></div>
           <div class="add-titile">
             新增数据产品
           </div>
@@ -430,10 +430,10 @@ const handleWindowResize = () => {
             </div>
           </div>
         </div>
-        <div v-if="!listData.length" class="card-noData">
+        <!-- <div v-if="listData.length" class="card-noData">
           <img src="../../assets/images/no-data.png" :style="{ width: '96px', height: '96px' }" />
           <span>暂无数据资源目录</span>
-        </div>
+        </div> -->
       </div>
 
     </div>
@@ -467,6 +467,8 @@ const handleWindowResize = () => {
   position: relative;
 
   .card-noData {
+    height: 100%;
+    width: 100%;
     background: #fafafa;
     display: flex;
     flex-direction: column;
@@ -506,6 +508,7 @@ const handleWindowResize = () => {
     justify-content: center;
     align-items: center;
     flex-direction: column;
+    z-index: 10;
 
     &:hover {
       box-shadow: 0 4px 12px rgba(0, 0, 0, 0.1);

@@ -46,7 +46,7 @@ const tableFields = ref([
   //   { label: "企业名称", field: "tenantName", width: 240, align: "left" },
   { label: "评估机构", field: "issuingEntityName", width: 250, align: "left" },
   {
-    label: "状态", field: "approveState", type: "tag", width: 96, align: 'center', getName: (scope) => {
+    label: "审批状态", field: "approveState", type: "tag", width: 96, align: 'center', getName: (scope) => {
       const approveVO = scope.row.approveVO || {}
       switch (approveVO.approveState) {
         case 'N':
@@ -264,10 +264,10 @@ const tableInfo = ref({
 const getTableBtns = (row) => {
   let btnsArr: any[] = [];
   const approveVO = row.approveVO || {};
-  const approveState = row.approveState || null;
+  const approveState = row.approveVO.approveState || null;
   const approveStaffGuids = approveVO.approveStaffGuids || [];
   const staffGuid = approveVO.staffGuid || '';
-  const bizApproveState = row.bizApproveState;
+  const bizApproveState = row.approveState;
   const currentStaffGuid = userData.staffGuid
   let isShowCancel = false;
   let flowState;

@@ -46,24 +46,28 @@ const getCgDirTreeData = async () => {
   const params = {
     execGuid: execGuidInfo.value.execGuid
   }
+  if (!execGuidInfo.value.execGuid) {
+    return;
+  }
   const res: any = await getTaskExeTreeList(params);
   if (res.code == proxy.$passCode) {
 
     const transformedData: any = [{
-      classifyDetailGuid: execGuidInfo.value.guid, // 新增字段 GUID
-      classifyName: execGuidInfo.value.cgDirName,               // 新增字段目录名称
+      classifyDetailGuid: execGuidInfo.value?.guid, // 新增字段 GUID
+      classifyName: execGuidInfo.value?.cgDirName,               // 新增字段目录名称
       children: res.data,                     // 将原始数据放入 children
     }];
     CgDirTreeList.value = transformedData;
     treeInfo.value.data = transformedData;
-    currentPath.value = [transformedData[0].classifyName];
-    treeInfo.value.expandedKey.push(transformedData[0].classifyDetailGuid);
-    treeInfo.value.currentNodeKey = transformedData[0].classifyDetailGuid;
+    currentPath.value = [transformedData[0]?.classifyName];
+    treeInfo.value.expandedKey.push(transformedData[0]?.classifyDetailGuid);
+    treeInfo.value.currentNodeKey = transformedData[0]?.classifyDetailGuid;
     // classifyDetailGuidInfo.value = res.data[0].classifyDetailGuid;
     searchItemList.value[0].options = res.data || [];
-    refGradeGuid.value = res.data[0].refGradeGuid || '';
+    refGradeGuid.value = res.data[0]?.refGradeGuid || '';
     treeInfo.value.loading = false;
   } else {
+    treeInfo.value.loading = false;
     proxy.$ElMessage.error(res.msg);
   }
 }
@@ -143,7 +147,7 @@ onMounted(async () => {
   await getExecGuid();
   await getCgDirTreeData();
   await getCgDirFieldPage({
-    execGuid: execGuidInfo.value.execGuid,
+    execGuid: execGuidInfo.value?.execGuid,
     classifyDetail: classifyDetailGuidInfo.value
   });
   // getDictionaryList();
@@ -1280,8 +1284,8 @@ const getDataBaseTreeData = async () => {
     if (localStorage.getItem("shouldReloadData")) {
       dataBaseTreeInfo.value.expandedKey = [];
       const info = JSON.parse(localStorage.getItem("onActiveInfo") || '{}');
-      dataBaseTreeInfo.value.expandedKey.push(dataArray[info.dbindex].guid);
-      dataBaseTreeInfo.value.currentNodeKey = dataArray[info.dbindex].guid;
+      dataBaseTreeInfo.value.expandedKey.push(dataArray[info.dbindex]?.guid);
+      dataBaseTreeInfo.value.currentNodeKey = dataArray[info.dbindex]?.guid;
       dataBaseGuid.value = dataArray[info?.dbindex].databaseGuid;
       currentDatabasePath.value = info?.path;
       if (dataArray[info?.dbindex].dicType === 1) {
@@ -1323,6 +1327,7 @@ const getDataBaseTreeData = async () => {
 
     dataBaseTreeInfo.value.loading = false;
   } else {
+    dataBaseTreeInfo.value.loading = true;
     proxy.$ElMessage.error(res.msg);
   }
 };

@@ -29,16 +29,16 @@ const getClassifyGradeTree = async () => {
     classGradeTreeData.value = transformedData || [];
     treeInfo.value.data = classGradeTreeData.value;
     // 默认展开第一级
-    expandedKey.value = classGradeTreeData.value[0].guid;
-    treeInfo.value.expandedKey.push(classGradeTreeData.value[0].guid);
+    expandedKey.value = classGradeTreeData.value[0]?.guid;
+    treeInfo.value.expandedKey.push(classGradeTreeData.value[0]?.guid);
     // 寻找第一children中guid
     if (classGradeTreeData.value[0].children) {
-      treeInfo.value.currentNodeKey = classGradeTreeData.value[0].children[0].guid;
+      treeInfo.value.currentNodeKey = classGradeTreeData.value[0].children[0]?.guid;
       // 分类明细guid
-      classifyDetailGuid.value = classGradeTreeData.value[0].children[0].guid;
+      classifyDetailGuid.value = classGradeTreeData.value[0].children[0]?.guid;
     }
     // 分别赋值 分类guid
-    classifyGuid.value = classGradeTreeData.value[0].guid;
+    classifyGuid.value = classGradeTreeData.value[0]?.guid;
     console.log('getClassifyGradeTree', transformedData);
     newCreateGradeFormItems.value[1].options = transformDataForTree([transformedData[0]])
     treeInfo.value.loading = false;

@@ -80,7 +80,7 @@ const tableInfo = ref({
     },
     {
       label: "审核状态", field: "approveState", width: TableColumnWidth.STATE, align: 'center', type: "tag", getName: (scope) => {
-        return filterVal(scope.row.approveState, 'approveState');
+        return filterVal(scope.row.approveVO.approveState, 'approveState');
       }
     },
     {
@@ -848,7 +848,7 @@ const formInfo = ref<any>({
         <el-button type="primary" @click="toPatn1('add', 'add1')" v-preReClick>新建</el-button>
       </div> -->
     </div>
-    <div class="list-content">
+    <div class="list-content" v-if="demandListData.length > 0">
       <div class="card-content" v-for="item in demandListData" :key="item.guid">
         <div class="header">
           <img class="left-img" :src="(item.picUrl && typeof item.picUrl == 'string') ? item.picUrl : defaultItemLogo"
@@ -868,12 +868,14 @@ const formInfo = ref<any>({
           </div>
         </div>
         <div class="operator-btn" @click="btnClick(item)">
-          <!-- <div class="left-btn borderRight" @click="btnClick(item)">更新模板</div> -->
+
           <div class="left-btn">资产登记</div>
         </div>
       </div>
     </div>
-    <div class="table_panel_wrap">
+    <div class="table_panel_wrap" :style="{
+      height: demandListData.length > 0 ? 'calc(100% - 230px)' : 'calc(100% - 54px)'
+    }">
       <Table :tableInfo="tableInfo" @tableBtnClick="tableBtnClick" @tablePageChange="tablePageChange"
         @tableSwitchBeforeChange="tableSwitchBeforeChange" />
     </div>
@@ -910,7 +912,7 @@ const formInfo = ref<any>({
 
   .table_panel_wrap {
     width: 100%;
-    height: calc(100% - 230px);
+    // height: calc(100% - 54px);
     padding: 0px 8px 0;
   }