数据资产登记更新

@@ -7,7 +7,6 @@ import { ref } from 'vue';
 import TableTools from "@/components/Tools/table_tools.vue";
 import TableTools from "@/components/Tools/table_tools.vue";
 import { ElMessage, ElMessageBox } from 'element-plus';
 import { ElMessage, ElMessageBox } from 'element-plus';
 import { CarouselPanel } from '@/components/CarouselPanel';
 import { CarouselPanel } from '@/components/CarouselPanel';
-import DialogApproval from '@/components/ApprovalProcess/dialog_approval.vue';
 import { useRouter, useRoute } from "vue-router";
 import { useRouter, useRoute } from "vue-router";
 import { MoreFilled } from "@element-plus/icons-vue";
 import { MoreFilled } from "@element-plus/icons-vue";
 import { changeNum } from "@/utils/common";
 import { changeNum } from "@/utils/common";
@@ -96,24 +95,14 @@ const pageInfo = ref({
   tenantGuid: '',
   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" },
 const tableFields = ref([{ label: "序号", type: "index", width: 56, align: "center" },
 { label: "资产名称", field: "daName", width: 160, align: "left" },
 { label: "资产名称", field: "daName", width: 160, align: "left" },
 { label: "数据分类", field: "dataCategoryName", width: 120, align: "left" },
 { label: "数据分类", field: "dataCategoryName", width: 120, align: "left" },
 { label: "存储方式", field: "storageFormName", width: 120, align: "left" },
 { label: "存储方式", field: "storageFormName", width: 120, align: "left" },
 { label: "数交所名称", field: "exchangeName", width: 160, 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 || {}
     const approveVO = scope.row.approveVO || {}
     switch (approveVO.approveState) {
     switch (approveVO.approveState) {
       case 'N':
       case 'N':
@@ -145,16 +134,6 @@ 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: "updateUserName", width: 140 },
 { label: "修改时间", field: "updateTime", width: 180 }]);
 { label: "修改时间", field: "updateTime", width: 180 }]);
 
 
@@ -212,12 +191,12 @@ const getTableBtns = (row, includeDetail = true) => {
     if (flowState === 2) {
     if (flowState === 2) {
       btnsArr.push(...[{ label: "通过", value: "pass" }, { label: "驳回", value: "reject" }])
       btnsArr.push(...[{ label: "通过", value: "pass" }, { label: "驳回", value: "reject" }])
     } else if (flowState === 3) {
     } else if (flowState === 3) {
-      if (bizApproveState != 'D') {
+      if (bizApproveState != 'D' && !row.zqName) {
         btnsArr.push({ label: "重新提交", value: "edit" })
         btnsArr.push({ label: "重新提交", value: "edit" })
       }
       }
     }
     }
-    isShowCancel && btnsArr.push({ label: "撤销", value: "revoke" })
-    flowState === 3 && btnsArr.push({ label: "删除", value: "delete" })
+    isShowCancel && !row.zqName && btnsArr.push({ label: "撤销", value: "revoke" })
+    flowState === 3 && !row.zqName && btnsArr.push({ label: "删除", value: "delete" })
   }
   }
   return btnsArr
   return btnsArr
 }
 }
@@ -498,7 +477,7 @@ const rejectDialogInfo = ref({
             block: true,
             block: true,
             col: 'margin_b_0',
             col: 'margin_b_0',
           }
           }
-        ]
+        ],
       }
       }
     }
     }
   ],
   ],
@@ -584,8 +563,6 @@ const rejectDialogBtnClick = (btn, info) => {
     </div>
     </div>
     <Dialog :dialogInfo="passDialogInfo" @btnClick="passDialogBtnClick" />
     <Dialog :dialogInfo="passDialogInfo" @btnClick="passDialogBtnClick" />
     <Dialog :dialogInfo="rejectDialogInfo" @btnClick="rejectDialogBtnClick" />
     <Dialog :dialogInfo="rejectDialogInfo" @btnClick="rejectDialogBtnClick" />
-    <DialogApproval :visible="approvalDialogVisible" :currentRowInfo="systemApproveCurrentRowInfo"
-    @dialog-cancel="handleApprovalDialogCancel"></DialogApproval>
   </div>
   </div>
 </template>
 </template>