数据资产登记更新

@@ -7,6 +7,7 @@ import { ref } from 'vue';
 import TableTools from "@/components/Tools/table_tools.vue";
 import { ElMessage, ElMessageBox } from 'element-plus';
 import { CarouselPanel } from '@/components/CarouselPanel';
+import DialogApproval from '@/components/ApprovalProcess/dialog_approval.vue';
 import { useRouter, useRoute } from "vue-router";
 import { MoreFilled } from "@element-plus/icons-vue";
 import { changeNum } from "@/utils/common";
@@ -95,14 +96,24 @@ const pageInfo = ref({
   tenantGuid: '',
 });
 
+const systemApproveCurrentRowInfo: any = ref({})
+
+const approvalDialogVisible = ref(false);
+
+const handleApprovalDialogCancel = (reSubmit) => {
+  approvalDialogVisible.value = false;
+  if (reSubmit) {
+    getTableData();
+  }
+}
+
 const tableFields = ref([{ label: "序号", type: "index", width: 56, align: "center" },
 { label: "资产名称", field: "daName", width: 160, align: "left" },
 { label: "数据分类", field: "dataCategoryName", width: 120, align: "left" },
 { label: "存储方式", field: "storageFormName", width: 120, align: "left" },
 { label: "数交所名称", field: "exchangeName", width: 160, align: "left" },
-{ label: "专区名称", field: "zqName", width: 160, 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':
@@ -134,6 +145,16 @@ const tableFields = ref([{ label: "序号", type: "index", width: 56, align: "ce
     }
   }
 },
+{
+  label: "主平台审批状态", field: "crossPlatformApproveState", type: "approveTagBtn", width: 170, align: 'center', btn: {
+    label: '查看', visible: (scope) => {
+      return scope.row.crossPlatformApproveState != null;
+    }, click: (scope) => {
+      systemApproveCurrentRowInfo.value = scope.row;
+      approvalDialogVisible.value = true;
+    }
+  }
+},
 { label: "修改人", field: "updateUserName", width: 140 },
 { label: "修改时间", field: "updateTime", width: 180 }]);
 
@@ -191,12 +212,12 @@ const getTableBtns = (row, includeDetail = true) => {
     if (flowState === 2) {
       btnsArr.push(...[{ label: "通过", value: "pass" }, { label: "驳回", value: "reject" }])
     } else if (flowState === 3) {
-      if (bizApproveState != 'D' && !row.zqName) {
+      if (bizApproveState != 'D') {
         btnsArr.push({ label: "重新提交", value: "edit" })
       }
     }
-    isShowCancel && !row.zqName && btnsArr.push({ label: "撤销", value: "revoke" })
-    flowState === 3 && !row.zqName && btnsArr.push({ label: "删除", value: "delete" })
+    isShowCancel && btnsArr.push({ label: "撤销", value: "revoke" })
+    flowState === 3 && btnsArr.push({ label: "删除", value: "delete" })
   }
   return btnsArr
 }
@@ -425,7 +446,7 @@ const passDialogInfo = ref({
 
 const passDialogBtnClick = (btn, info) => {
   if (btn.value == 'submit') {
-    loading.value = true;
+    passDialogInfo.value.footer.btns[1].loading = true;
     let params = {
       guid: currTableData.value.approveVO.approveGuid,
       flowType: currTableData.value.approveVO.flowType,
@@ -433,7 +454,7 @@ const passDialogBtnClick = (btn, info) => {
       approveStaffGuid: userData.staffGuid,
     }
     passFlowData(params, currTableData.value.tenantGuid).then((res: any) => {
-      loading.value = false;
+      passDialogInfo.value.footer.btns[1].loading = false;
       if (res?.code == proxy.$passCode) {
         if (res.data) {
           ElMessage.success('审批成功');
@@ -446,7 +467,7 @@ const passDialogBtnClick = (btn, info) => {
         ElMessage.error(res.msg);
       }
     }).catch(() => {
-      loading.value = false;
+      passDialogInfo.value.footer.btns[1].loading = false;
     });
   } else if (btn.value == 'cancel') {
     passDialogInfo.value.visible = false;
@@ -484,7 +505,7 @@ const rejectDialogInfo = ref({
   footer: {
     btns: [
       { type: "default", label: "取消", value: "cancel" },
-      { type: "primary", label: "确定", value: "submit" },
+      { type: "primary", label: "确定", value: "submit", loading: false },
     ],
   },
 });
@@ -495,7 +516,7 @@ const rejectDialogBtnClick = (btn, info) => {
       ElMessage.error('请填写驳回理由');
       return
     }
-    loading.value = true;
+    rejectDialogInfo.value.footer.btns[1].loading = true;
     let params = {
       guid: currTableData.value.approveVO.approveGuid,
       flowType: currTableData.value.approveVO.flowType,
@@ -503,7 +524,7 @@ const rejectDialogBtnClick = (btn, info) => {
       approveStaffGuid: userData.staffGuid,
     }
     rejectFlowData(params, currTableData.value.tenantGuid).then((res: any) => {
-      loading.value = false;
+      rejectDialogInfo.value.footer.btns[1].loading = false;
       if (res?.code == proxy.$passCode) {
         if (res.data) {
           ElMessage.success('驳回成功');
@@ -516,7 +537,7 @@ const rejectDialogBtnClick = (btn, info) => {
         ElMessage.error(res.msg);
       }
     }).catch(() => {
-      loading.value = false;
+      rejectDialogInfo.value.footer.btns[1].loading = false;
     });
   } else if (btn.value == 'cancel') {
     rejectDialogInfo.value.visible = false;
@@ -563,6 +584,8 @@ const rejectDialogBtnClick = (btn, info) => {
     </div>
     <Dialog :dialogInfo="passDialogInfo" @btnClick="passDialogBtnClick" />
     <Dialog :dialogInfo="rejectDialogInfo" @btnClick="rejectDialogBtnClick" />
+    <DialogApproval :visible="approvalDialogVisible" :currentRowInfo="systemApproveCurrentRowInfo"
+    @dialog-cancel="handleApprovalDialogCancel"></DialogApproval>
   </div>
 </template>