数据资产登记更新

lxs
Showing 6 changed files with 214 additions and 85 deletions
src/router/modules/dataAssetRegistry.ts
src/store/modules/user.ts
src/views/data_asset/qualityEvaluate.vue
src/views/data_asset/registerDetail.vue
src/views/data_asset/registerManagemant.vue
src/views/data_asset/registerStart.vue
--- a/src/router/modules/dataAssetRegistry.ts
View file @b68ea3d
+++ b/src/router/modules/dataAssetRegistry.ts
View file @b68ea3d
@@ -35,7 +35,7 @@ const routes: RouteRecordRaw[] = [
          reuse: true
        },
        beforeEnter: (to, from) => {
-          to.meta.title = to.query.type == 'edit' ? `编辑-${to.query.name}` : '新建资产登记';
+          to.meta.title = to.query.type == 'create' ? '新建资产登记' : `编辑-${to.query.name}`;
          to.meta.editPage = true;
        }
      },
--- a/src/store/modules/user.ts
View file @b68ea3d
+++ b/src/store/modules/user.ts
View file @b68ea3d
@@ -4,7 +4,7 @@ import router from '@/router'
 import { ElMessage } from 'element-plus'
 import apiUser from '@/api/modules/user'
 import { getCurrentTime } from '@/utils/common'
-import { getSystemMenu, getUserInfo, getTokenByCode, loginOut, refreshToken, editPasswordInterface, getCurrentUserInfo, getCurrentUserInfo } from '@/api/modules/queryService'
+import { getSystemMenu, getUserInfo, getTokenByCode, loginOut, refreshToken, editPasswordInterface, getCurrentUserInfo } from '@/api/modules/queryService'
 const useUserStore = defineStore(
  // 唯一ID
--- a/src/views/data_asset/qualityEvaluate.vue
View file @b68ea3d
+++ b/src/views/data_asset/qualityEvaluate.vue
View file @b68ea3d
--- a/src/views/data_asset/registerDetail.vue
View file @b68ea3d
+++ b/src/views/data_asset/registerDetail.vue
View file @b68ea3d
@@ -1167,10 +1167,11 @@ const handleClickDamCatalogDetail = () => {
              </div>
              <div class="list_item">
                <span class="item_label">所属行业:</span>
-                <span class="item_value"><ellipsis-tooltip :content="(assetDetailInfo.ownIndustryName?.filter(u => u != '其他')?.join(',') +
+                <span class="item_value"><ellipsis-tooltip
+                    :content="(assetDetailInfo.ownIndustryName?.filter(u => u != '其他')?.join(',') +
                      (assetDetailInfo.ownIndustry?.includes(4)
-                    ? ((assetDetailInfo.ownIndustryName?.length > 1 ? ',' : '') + assetDetailInfo.ownIndustryOther) : '')) ?? '--'"
+                        ? ((assetDetailInfo.ownIndustryName?.length > 1 ? ',' : '') + assetDetailInfo.ownIndustryOther) : '')) ?? '--'" class-name="w100f"
-                    class-name="w100f" :refName="'tooltipOver' + 'ownIndustryName'"></ellipsis-tooltip></span>
+                    :refName="'tooltipOver' + 'ownIndustryName'"></ellipsis-tooltip></span>
              </div>
              <div class="list_item">
                <span class="item_label">本次登记:</span>
@@ -1179,7 +1180,8 @@ const handleClickDamCatalogDetail = () => {
              </div>
              <div class="list_item">
                <span class="item_label">数据规模(条):</span>
-                <span class="item_value">{{ assetDetailInfo.dataScale != null ? changeNum(assetDetailInfo.dataScale, 0) :
+                <span class="item_value">{{ assetDetailInfo.dataScale != null ? changeNum(assetDetailInfo.dataScale, 0)
+                  :
                  '--' }}</span>
              </div>
              <div class="list_item">
@@ -1187,6 +1189,11 @@ const handleClickDamCatalogDetail = () => {
                <span class="item_value">{{ assetDetailInfo.subjectDomainName || assetDetailInfo.subjectDomain || '--'
                  }}</span>
              </div>
+              <div class="list_item" v-if="assetDetailInfo.damGuid">
+                <span class="item_label">数据来源:</span>
+                <span class="item_value">{{ dataSourcesList.find(d => d.value == assetDetailInfo.dataSources)?.label ||
+                  '--' }}</span>
+              </div>
            </div>
            <div class="first-col" style="width: 250px;">
              <div class="list_item">
@@ -1204,8 +1211,13 @@ const handleClickDamCatalogDetail = () => {
                    + assetDetailInfo.updateFrequencyOther) : '')) ?? '--' }}</span>
              </div>
              <div class="list_item">
-                <span class="item_label">质量及价值评估:</span>
+                <span class="item_label">是否完成质量评估:</span>
-                <span class="item_value">{{ assetDetailInfo.isEvaluationAssessment == 'Y' ? '是' : '否' }}</span>
+                <span class="item_value">{{ assetDetailInfo.isQualityAssessment == 'Y' ? '是' : '否' }}</span>
+              </div>
+              <div class="list_item" v-if="(detailType == 'asset' && assetDetailInfo.isQualityAssessment == 'Y')">
+                <span class="item_label">质量评估机构:</span>
+                <span class="item_value">{{ assetDetailInfo.registerAttachment.qualityEvaluationInstitution || '--'
+                  }}</span>
              </div>
              <div class="list_item">
                <span class="item_label">病例总数(例):</span>
@@ -1226,10 +1238,11 @@ const handleClickDamCatalogDetail = () => {
              </div>
              <div class="list_item">
                <span class="item_label">取得方式:</span>
-                <span class="item_value"><ellipsis-tooltip :content="(assetDetailInfo.dataGetWayName?.filter(u => u != '其他')?.join(',') +
+                <span class="item_value"><ellipsis-tooltip
+                    :content="(assetDetailInfo.dataGetWayName?.filter(u => u != '其他')?.join(',') +
                      (assetDetailInfo.dataGetWay?.includes(8) ?
-                    ((assetDetailInfo.dataGetWayName?.length > 1 ? ',' : '') + assetDetailInfo.dataGetWayOther) : '')) ?? '--'"
+                        ((assetDetailInfo.dataGetWayName?.length > 1 ? ',' : '') + assetDetailInfo.dataGetWayOther) : '')) ?? '--'" class-name="w100f"
-                    class-name="w100f" :refName="'tooltipOver' + 'dataGetWayName'"></ellipsis-tooltip>
+                    :refName="'tooltipOver' + 'dataGetWayName'"></ellipsis-tooltip>
                </span>
              </div>
              <div class="list_item">
@@ -1238,6 +1251,15 @@ const handleClickDamCatalogDetail = () => {
                  (assetDetailInfo.registeredExchangeName?.join(',') ?? '--') }}</span>
              </div>
              <div class="list_item">
+                <span class="item_label">是否完成价值评估:</span>
+                <span class="item_value">{{ assetDetailInfo.isCostAssessment == 'Y' ? '是' : '否' }}</span>
+              </div>
+              <div class="list_item" v-if="(detailType == 'asset' && assetDetailInfo.isCostAssessment == 'Y')">
+                <span class="item_label">价值评估机构:</span>
+                <span class="item_value">{{ assetDetailInfo.registerAttachment.costAssessmentInstitution || '--'
+                  }}</span>
+              </div>
+              <div class="list_item">
                <span class="item_label">资产类型:</span>
                <span class="item_value">{{ assetDetailInfo.damTypeName || '--' }}</span>
              </div>
@@ -1246,11 +1268,6 @@ const handleClickDamCatalogDetail = () => {
                <span class="item_value">{{ assetDetailInfo.dataStartDate ?
                  `${assetDetailInfo.dataStartDate}至${assetDetailInfo.dataEndDate}` : '--' }}</span>
              </div>
-              <div class="list_item" v-if="assetDetailInfo.damGuid">
-                <span class="item_label">数据来源:</span>
-                <span class="item_value">{{ dataSourcesList.find(d => d.value == assetDetailInfo.dataSources)?.label ||
-                  '--' }}</span>
-              </div>
            </div>
          </div>
          <div class="list_item is_block">
@@ -1380,6 +1397,82 @@ const handleClickDamCatalogDetail = () => {
                </div>
              </span>
            </div>
+            <div class="list_item is_block isFile" :style="{ width: '40%' }"
+              v-if="(detailType == 'asset' && assetDetailInfo.isQualityAssessment == 'Y') && assetDetailInfo.registerAttachment?.qualityEvaluationFile?.length">
+              <span class="item_label" :style="{ width: 'auto', 'text-align': 'left' }">质量评估报告</span>
+              <span v-for="(item) in (assetDetailInfo.registerAttachment?.qualityEvaluationFile || [])"
+                class="item_value" :style="{ 'padding-left': '0px' }">
+                <div class="file-operate">
+                  <template
+                    v-if="item.name.substring(item.name.lastIndexOf('.') + 1) == 'xls' || item.name.substring(item.name.lastIndexOf('.') + 1) == 'xlsx' || item.name.substring(item.name.lastIndexOf('.') + 1) == 'csv'">
+                    <img class="file-img" src="../../assets/images/excel.png" />
+                  </template>
+                  <template
+                    v-else-if="item.name.substring(item.name.lastIndexOf('.') + 1) == 'doc' || item.name.substring(item.name.lastIndexOf('.') + 1) == 'docx'">
+                    <img class="file-img" src="../../assets/images/word.png" />
+                  </template>
+                  <template v-else-if="item.name.substring(item.name.lastIndexOf('.') + 1) == 'zip'">
+                    <img class="file-img" src="../../assets/images/zip.png" />
+                  </template>
+                  <template v-else-if="item.name.substring(item.name.lastIndexOf('.') + 1) == 'rar'">
+                    <img class="file-img" src="../../assets/images/RAR.png" />
+                  </template>
+                  <template v-else-if="item.name.substring(item.name.lastIndexOf('.') + 1) == 'pdf'">
+                    <img class="file-img" src="../../assets/images/PDF.png" />
+                  </template>
+                  <template v-else-if="item.name.substring(item.name.lastIndexOf('.') + 1) == 'png'">
+                    <img class="file-img" src="../../assets/images/png.png" />
+                  </template>
+                  <template
+                    v-else-if="item.name.substring(item.name.lastIndexOf('.') + 1) == 'jpg' || item.name.substring(item.name.lastIndexOf('.') + 1) == 'jpeg'">
+                    <img class="file-img" src="../../assets/images/jpg.png" />
+                  </template>
+                  <div class="file-name">{{ item.name }}</div>
+                  <div :style="{ right: '36px' }"
+                    v-if="item.name.substring(item.name.lastIndexOf('.') + 1) == 'pdf' || item.name.substring(item.name.lastIndexOf('.') + 1) == 'png' || item.name.substring(item.name.lastIndexOf('.') + 1) == 'jpg' || item.name.substring(item.name.lastIndexOf('.') + 1) == 'jpeg'"
+                    class="file-preview" @click="onUploadFilePreview(item)">查看</div>
+                  <div :style="{ right: '0px' }" class="file-preview" @click="onUploadFileDownload(item)">下载</div>
+                </div>
+              </span>
+            </div>
+            <div class="list_item is_block isFile" :style="{ width: '40%', 'margin-right': '28px' }"
+              v-if="(detailType == 'asset' && assetDetailInfo.isCostAssessment == 'Y') && assetDetailInfo.registerAttachment?.costAssessmentFile?.length">
+              <span class="item_label" :style="{ width: 'auto', 'text-align': 'left' }">价值评估报告</span>
+              <span v-for="(item) in (assetDetailInfo.registerAttachment?.costAssessmentFile || [])" class="item_value"
+                :style="{ 'padding-left': '0px' }">
+                <div class="file-operate">
+                  <template
+                    v-if="item.name.substring(item.name.lastIndexOf('.') + 1) == 'xls' || item.name.substring(item.name.lastIndexOf('.') + 1) == 'xlsx' || item.name.substring(item.name.lastIndexOf('.') + 1) == 'csv'">
+                    <img class="file-img" src="../../assets/images/excel.png" />
+                  </template>
+                  <template
+                    v-else-if="item.name.substring(item.name.lastIndexOf('.') + 1) == 'doc' || item.name.substring(item.name.lastIndexOf('.') + 1) == 'docx'">
+                    <img class="file-img" src="../../assets/images/word.png" />
+                  </template>
+                  <template v-else-if="item.name.substring(item.name.lastIndexOf('.') + 1) == 'zip'">
+                    <img class="file-img" src="../../assets/images/zip.png" />
+                  </template>
+                  <template v-else-if="item.name.substring(item.name.lastIndexOf('.') + 1) == 'rar'">
+                    <img class="file-img" src="../../assets/images/RAR.png" />
+                  </template>
+                  <template v-else-if="item.name.substring(item.name.lastIndexOf('.') + 1) == 'pdf'">
+                    <img class="file-img" src="../../assets/images/PDF.png" />
+                  </template>
+                  <template v-else-if="item.name.substring(item.name.lastIndexOf('.') + 1) == 'png'">
+                    <img class="file-img" src="../../assets/images/png.png" />
+                  </template>
+                  <template
+                    v-else-if="item.name.substring(item.name.lastIndexOf('.') + 1) == 'jpg' || item.name.substring(item.name.lastIndexOf('.') + 1) == 'jpeg'">
+                    <img class="file-img" src="../../assets/images/jpg.png" />
+                  </template>
+                  <div class="file-name">{{ item.name }}</div>
+                  <div :style="{ right: '36px' }"
+                    v-if="item.name.substring(item.name.lastIndexOf('.') + 1) == 'pdf' || item.name.substring(item.name.lastIndexOf('.') + 1) == 'png' || item.name.substring(item.name.lastIndexOf('.') + 1) == 'jpg' || item.name.substring(item.name.lastIndexOf('.') + 1) == 'jpeg'"
+                    class="file-preview" @click="onUploadFilePreview(item)">查看</div>
+                  <div :style="{ right: '0px' }" class="file-preview" @click="onUploadFileDownload(item)">下载</div>
+                </div>
+              </span>
+            </div>
            <!-- <span
              v-if="tenantDetail.businessLicense?.length || assetDetailInfo.registerAttachment?.commitmentLetter?.length"
              class="small-title" :style="{ marginTop: '10px' }">公司信息</span> -->
--- a/src/views/data_asset/registerManagemant.vue
View file @b68ea3d
+++ b/src/views/data_asset/registerManagemant.vue
View file @b68ea3d
@@ -8,21 +8,8 @@ import TableTools from "@/components/Tools/table_tools.vue";
 import { ElMessage, ElMessageBox } from 'element-plus';
 import { useRouter, useRoute } from "vue-router";
 import { MoreFilled } from "@element-plus/icons-vue";
-import {
+import { changeNum, tagMethod, tagType, } from "@/utils/common";
-  changeNum,
+import { getRegisterList, registerDelete, getExchangeList } from "@/api/modules/dataAsset";
-  tagMethod,
-  tagType,
-} from "@/utils/common";
-import {
-  getRegisterList,
-  registerDelete,
-  registerApproveCancel,
-  registerApproveReSubmit,
-  registerApproveAllow,
-  registerApproveBackup,
-  getRegisterTenant,
-  getExchangeList
-} from "@/api/modules/dataAsset";
 import { passFlowData, rejectFlowData, revokeFlowData } from "@/api/modules/workFlowService";
 import useDataAssetStore from "@/store/modules/dataAsset";
 import useUserStore from "@/store/modules/user";
@@ -108,7 +95,39 @@ const tableFields = ref([{ label: "序号", type: "index", width: 56, align: "ce
    return scope.row['ownIndustryName']?.join(',')
  }
 },
-{ label: "状态", field: "approveState", type: "tag", width: 96, align: 'center' },
+{
+  label: "状态", field: "approveState", type: "tag", width: 96, align: 'center', getName: (scope) => {
+    const approveVO = scope.row.approveVO || {}
+    switch (approveVO.approveState) {
+      case 'N':
+        return '草稿中';
+      case 'A':
+        return '审批中';
+      case 'Y':
+        return '已通过';
+      case 'R':
+        return '已驳回';
+      case 'C':
+        return '已撤销';
+      case 'I':
+        return '--';
+      default:
+        return '草稿中';
+    }
+  }, tagType: (scope) => {
+    const approveVO = scope.row.approveVO || {}
+    switch (approveVO.approveState) {
+      case 'A':
+        return 'warning';
+      case 'Y':
+        return 'success';
+      case 'R':
+        return 'danger';
+      default:
+        return 'info';
+    }
+  }
+},
 { label: "修改人", field: "updateUserName", width: 140 },
 { label: "修改时间", field: "updateTime", width: 180 }]);
@@ -134,7 +153,7 @@ const tableInfo = ref({
  actionInfo: {
    label: "操作",
    type: "btn",
-    width: 160,
+    width: 180,
    btns: (scope) => {
      let row = scope.row;
      return getTableBtns(row);
@@ -143,34 +162,45 @@ const tableInfo = ref({
 });
 const getTableBtns = (row, includeDetail = true) => {
-  console.log(userData)
  let btnsArr: any[] = [];
-  if (row.approveState == 'N') {//只有草稿中的详情是可以编辑的
+  const approveVO = row.approveVO;
-    includeDetail && btnsArr.push({ label: "编辑", value: "edit" })
+  const currentStaffGuid = userData.staffGuid
-    if (row.tenantGuid == userData.tenantGuid) {
+  const bizApproveState = row.approveState;
-      btnsArr.push({ label: "删除", value: "delete" });
+  const approveState = approveVO?.approveState || 'N';
+  const approveStaffGuids = approveVO?.approveStaffGuids || [];
+  const staffGuid = approveVO?.staffGuid || '';
+  let isShowCancel = false;
+  let flowState;
+  if (approveState == 'N') {
+    flowState = 1;
+  }
+  if (approveState == 'A' && approveStaffGuids.indexOf(currentStaffGuid) > -1) {
+    flowState = 2;
  }
-  } else if (row.approveState == 'A') {//审批中
+  if ((approveState == 'C' || approveState == 'R') && staffGuid == currentStaffGuid) {
-    includeDetail && btnsArr.push({ label: "详情", value: "path_detail" })
+    flowState = 3;
-    if (row.tenantGuid == userData.tenantGuid) {
-      btnsArr.push({ label: "撤销", value: "revoke" });
  }
-    if (row.approveTenantGuids?.includes(userData.tenantGuid)) {
+  if (approveVO && approveVO.approveState == 'A' && staffGuid == currentStaffGuid) {
-      btnsArr.push({ label: "通过", value: "pass" });
+    isShowCancel = true;
-      btnsArr.push({ label: "驳回", value: "backup" });
  }
-  } else if (row.approveState == 'Y') {//已通过的不能删除。
-    includeDetail && btnsArr.push({ label: "详情", value: "path_detail" })
+  if (flowState === 1) {
-  } else if (row.approveState == 'R' || row.approveState == 'C') {//已驳回或已撤销
+    btnsArr = [{ label: "编辑", value: "edit" }, { label: "删除", value: "delete" }]
-    includeDetail && btnsArr.push({ label: "编辑", value: "edit" });
+  } else {
-    if (row.tenantGuid == userData.tenantGuid) {
+    btnsArr.push({ label: "详情", value: "detail" })
-      btnsArr.push({ label: "重新提交", value: "edit", disabled: false })
+    if (flowState === 2) {
+      btnsArr.push(...[{ label: "通过", value: "pass" }, { label: "驳回", value: "reject" }])
+      if (isShowCancel) {
+        btnsArr.push({ label: "撤销", value: "revoke" })
+      }
+    } else if (flowState === 3) {
+      if (bizApproveState != 'D') {
+        btnsArr.push({ label: "重新提交", value: "edit" })
      }
-    if (row.tenantGuid == userData.tenantGuid) {
+      btnsArr.push({ label: "删除", value: "delete" })
-      btnsArr.push({ label: "删除", value: "delete" });
    }
  }
-  return btnsArr;
+  return btnsArr
 }
 const currTableData: any = ref({});
@@ -195,6 +225,7 @@ const tableBtnClick = (scope, btn) => {
  const row = scope.row;
  currTableData.value = row;
  if (type === "edit") { //草稿中\已驳回\已撤销\已通过 状态，才可以编辑。
+    localStorage.setItem('isRestart', btn.label == '重新提交' ? 'true' : '');
    router.push({
      name: 'registerStart',
      query: { guid: row.guid, damGuid: row.damGuid, name: row.daName, type }
@@ -207,24 +238,26 @@ const tableBtnClick = (scope, btn) => {
      cancelButtonText: "取消",
      type: 'warning',
    }).then(() => {
-      listDataLoading.value = true;
+      loading.value = true;
      let params = {
        guid: row.approveVO.approveGuid,
        flowType: row.approveVO.flowType,
        approveStaffGuid: userData.staffGuid,
      }
      revokeFlowData(params).then((res: any) => {
-        listDataLoading.value = false;
+        loading.value = false;
        if (res?.code == proxy.$passCode) {
          if (res.data) {
            ElMessage.success('该审批流程撤销成功！');
-            row.approveState = "C";
+            getTableData();
          } else {
            ElMessage.error('该审批流程撤销失败！');
          }
        } else {
          ElMessage.error(res.msg);
        }
+      }).catch(() => {
+        loading.value = false;
      });
    }).catch(() => {
      ElMessage({
@@ -232,25 +265,14 @@ const tableBtnClick = (scope, btn) => {
        message: '已取消撤销'
      });
    });
-  } else if (type === 'path_detail') { // 详情, 若是草稿中，详情就是编辑，
+  } else if (type === 'detail') { // 详情, 若是草稿中，详情就是编辑，
-    // if (row.approveState === 'N') {
-    //   router.push({
-    //     name: 'registerStart',
-    //     query: { guid: row.guid, name: row.daName, type: 'detail' }
-    //   });
-    // } else {
-    //   router.push({
-    //     name: 'registerInfoDetail',
-    //     query: { guid: row.guid, type: 'asset', daTenantGuid: row.tenantGuid }
-    //   });
-    // }
    router.push({
      name: 'registerInfoDetail',
      query: { guid: row.guid, name: row.daName, type: 'asset' }
    });
  } else if (type === 'pass') {
    passDialogInfo.value.visible = true;
-  } else if (type == 'backup') {
+  } else if (type == 'reject') {
    rejectDialogInfo.value.visible = true;
  }
 };
@@ -277,7 +299,9 @@ const delTableOpen = (msg, type, isBatch: boolean = false) => {
  }).then(() => {
    let guids: any = [];
    guids = [currTableData.value.guid]
+    loading.value = true;
    registerDelete(guids).then((res: any) => {
+      loading.value = false;
      if (res.code == proxy.$passCode) {
        pageInfo.value.curr = 1;
        getTableData();
@@ -291,7 +315,9 @@ const delTableOpen = (msg, type, isBatch: boolean = false) => {
          message: res.msg,
        });
      }
-    })
+    }).catch(() => {
+      loading.value = false;
+    });
  }).catch(() => {
    ElMessage({
      type: 'info',
@@ -301,8 +327,7 @@ const delTableOpen = (msg, type, isBatch: boolean = false) => {
 };
 const getTableData = () => {
-  listDataLoading.value = true;
+  loading.value = true;
-  tableInfo.value.loading = true;
  getRegisterList({
    pageSize: pageInfo.value.limit,
    pageIndex: pageInfo.value.curr,
@@ -311,17 +336,19 @@ const getTableData = () => {
    tenantGuid: pageInfo.value.tenantGuid,
    exchangGuid: exchangGuid.value
  }).then((res: any) => {
-    listDataLoading.value = false;
+    loading.value = false;
-    tableInfo.value.loading = false;
    if (res.code == proxy.$passCode) {
      const data = res.data || {}
-      listData.value = tableInfo.value.data = data.records || [];
+      // listData.value = tableInfo.value.data = data.records || [];
+      tableInfo.value.data = data.records || []
      pageInfo.value.limit = data.pageSize
      pageInfo.value.curr = data.pageIndex
      pageInfo.value.rows = data.totalRows
    } else {
      ElMessage.error(res.msg);
    }
+  }).catch(() => {
+    loading.value = false;
  })
 }
@@ -423,7 +450,7 @@ const passDialogInfo = ref({
 const passDialogBtnClick = (btn, info) => {
  if (btn.value == 'submit') {
-    listDataLoading.value = true;
+    loading.value = true;
    let params = {
      guid: currTableData.value.approveVO.approveGuid,
      flowType: currTableData.value.approveVO.flowType,
@@ -431,7 +458,7 @@ const passDialogBtnClick = (btn, info) => {
      approveStaffGuid: userData.staffGuid,
    }
    passFlowData(params).then((res: any) => {
-      listDataLoading.value = false;
+      loading.value = false;
      if (res?.code == proxy.$passCode) {
        if (res.data) {
          ElMessage.success('审批成功');
@@ -443,6 +470,8 @@ const passDialogBtnClick = (btn, info) => {
      } else {
        ElMessage.error(res.msg);
      }
+    }).catch(() => {
+      loading.value = false;
    });
  } else if (btn.value == 'cancel') {
    passDialogInfo.value.visible = false;
@@ -491,7 +520,7 @@ const rejectDialogBtnClick = (btn, info) => {
      ElMessage.error('请填写驳回理由');
      return
    }
-    listDataLoading.value = true;
+    loading.value = true;
    let params = {
      guid: currTableData.value.approveVO.approveGuid,
      flowType: currTableData.value.approveVO.flowType,
@@ -499,7 +528,7 @@ const rejectDialogBtnClick = (btn, info) => {
      approveStaffGuid: userData.staffGuid,
    }
    rejectFlowData(params).then((res: any) => {
-      listDataLoading.value = false;
+      loading.value = false;
      if (res?.code == proxy.$passCode) {
        if (res.data) {
          ElMessage.success('驳回成功');
@@ -511,6 +540,8 @@ const rejectDialogBtnClick = (btn, info) => {
      } else {
        ElMessage.error(res.msg);
      }
+    }).catch(() => {
+      loading.value = false;
    });
  } else if (btn.value == 'cancel') {
    rejectDialogInfo.value.visible = false;
--- a/src/views/data_asset/registerStart.vue
View file @b68ea3d
+++ b/src/views/data_asset/registerStart.vue
View file @b68ea3d
@@ -407,8 +407,8 @@ onBeforeMount(() => {
        const data = res.data || {}
        let { approveVO } = data;
        draftDetailInfo.value = data;
-        deploymentId.value = approveVO.camundaDeploymentId;
+        deploymentId.value = approveVO?.camundaDeploymentId;
-        processInstanceId.value = approveVO.camundaInstanceId
+        processInstanceId.value = approveVO?.camundaInstanceId
        let coverageArea = '';
        let coverageAreas = [];
        let damTypeItem = baseFormItems.value.find(item => item.field == 'damType');
@@ -609,7 +609,6 @@ onBeforeMount(() => {
  })
  getParamsList({ dictType: '数据资产目录主题名称' }).then((res: any) => {
    if (res.code == proxy.$passCode) {
-      subjectDomainListData.value = replaceChildDictListKey(res.data) || [];
      let item = baseFormItems.value.find(item => item.field == 'subjectDomain');
      item && (item.options = subjectDomainListData.value);
    } else {
@@ -1326,8 +1325,11 @@ const baseFormRules = ref({
  registeredExchangeGuid: [{
    type: 'array', required: true, trigger: 'change', message: "请填写其他登记的交易所"
  }],
-  isEvaluationAssessment: [
+  isQualityAssessment: [
-    { required: true, trigger: 'change', message: "请填写是否质量及价值评估" }
+    { required: true, trigger: 'change', message: "请填写是否完成质量评估" }
+  ],
+  isCostAssessment: [
+    { required: true, trigger: 'change', message: "请填写是否完成价值评估" }
  ],
  applicationScenarios: [
    { required: true, trigger: 'blur', message: "请填写数据资产应用场景" }
@@ -2023,6 +2025,8 @@ const save = () => {
                  qualityEvaluationFile: uploadFormInline['qualityEvaluationFile']?.map(u => u.url) || [],
                  costAssessmentFile: uploadFormInline['costAssessmentFile']?.map(u => u.url) || [],
                  commitmentLetter: uploadFormInline['commitmentLetter']?.map(u => u.url) || [],
+                  qualityEvaluationInstitution: uploadFormInline.qualityEvaluationInstitution || '',
+                  costAssessmentInstitution: uploadFormInline.costAssessmentInstitution || '',
                },
                immediateApprove: true,
                isSubmit: true,
@@ -2034,6 +2038,7 @@ const save = () => {
              fullscreenLoading.value = true;
              if (draftDetailInfo.value.guid) {
                params.guid = draftDetailInfo.value.guid;
+                params.isRestart = localStorage.getItem('isRestart') ? true : false;
                registerUpdate(params).then((res: any) => {
                  fullscreenLoading.value = false;
                  if (res.code == proxy.$passCode) {