数据资产登记更新

@@ -17,7 +17,7 @@ import useDataAssetStore from "@/store/modules/dataAsset";
 import useUserStore from "@/store/modules/user";
 
 const userStore = useUserStore();
-const userData = JSON.parse(userStore.userData)
+const userData = JSON.parse(localStorage.userData)
 
 const assetStore = useDataAssetStore();
 
@@ -83,8 +83,6 @@ const searchItemList = ref([
 const pageInfo = ref({
   limit: 50,
   curr: 1,
-  rows: 0,
-  type: "normal",
   sizes: [
     { label: "10", value: 10 },
     { label: "50", value: 50 },
@@ -151,7 +149,11 @@ const tableInfo = ref({
   loading: false,
   fields: tableFields.value,
   data: listData.value,
-  showPage: false,
+  page: {
+    type: "normal",
+    rows: 0,
+    ...pageInfo.value,
+  },
   actionInfo: {
     label: "操作",
     type: "btn",
@@ -208,10 +210,9 @@ const currTableData: any = ref({});
 const btnClick = (btn) => {
   const type = btn.value;
   if (type == 'create') {
-    localStorage.setItem('isRestart', '');
     router.push({
       name: 'registerStart',
-      query: { exchangeGuid: btn.exchangeGuid, type }
+      query: { exchangeGuid: btn.exchangeGuid, isRestart: '', type }
     });
   } else if (type == 'search') {
     exchangGuid.value = btn.exchangeGuid;
@@ -226,10 +227,9 @@ 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, exchangeGuid: row.exchangeGuid, name: row.daName, type, serviceTenantGuid: row.tenantGuid }
+      query: { guid: row.guid, exchangeGuid: row.exchangeGuid, name: row.daName, isRestart: btn.label == '重新提交' ? 'true' : '', tenantGuid: row.tenantGuid, type }
     });
   } else if (type == "delete") {
     delTableOpen("此操作将永久删除该资产登记，是否继续?", "warning");
@@ -245,7 +245,7 @@ const tableBtnClick = (scope, btn) => {
         flowType: row.approveVO.flowType,
         approveStaffGuid: userData.staffGuid,
       }
-      revokeFlowData(params).then((res: any) => {
+      revokeFlowData(params, currTableData.value.tenantGuid).then((res: any) => {
         loading.value = false;
         if (res?.code == proxy.$passCode) {
           if (res.data) {
@@ -269,7 +269,7 @@ const tableBtnClick = (scope, btn) => {
   } else if (type === 'detail') { // 详情, 若是草稿中，详情就是编辑，
     router.push({
       name: 'registerInfoDetail',
-      query: { guid: row.guid, name: row.daName, type: 'asset',  serviceTenantGuid: row.tenantGuid }
+      query: { guid: row.guid, name: row.daName, tenantGuid: row.tenantGuid, type: 'asset' }
     });
   } else if (type === 'pass') {
     passDialogInfo.value.visible = true;
@@ -327,12 +327,11 @@ const getTableData = () => {
   }).then((res: any) => {
     loading.value = false;
     if (res.code == proxy.$passCode) {
-      const data = res.data || {}
-      // 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
+      const data = res.data || {};
+      tableInfo.value.data = data.records || [];
+      tableInfo.value.page.curr = res.data.pageIndex;
+      tableInfo.value.page.limit = res.data.pageSize;
+      tableInfo.value.page.rows = res.data.totalRows || 0;
     } else {
       ElMessage.error(res.msg);
     }
@@ -373,7 +372,7 @@ const toSearch = (val: any, clear: boolean = false) => {
   // getExchangeData();
 };
 
-const pageChange = (info) => {
+const tablePageChange = (info) => {
   pageInfo.value.curr = Number(info.curr);
   pageInfo.value.limit = Number(info.limit);
   getTableData();
@@ -435,7 +434,7 @@ const passDialogBtnClick = (btn, info) => {
       guid: currTableData.value.approveVO.approveGuid,
       flowType: currTableData.value.approveVO.flowType,
       approveSuggest: info.approveSuggest,
-      approveStaffGuid: userData.staffGuid
+      approveStaffGuid: userData.staffGuid,
     }
     passFlowData(params, currTableData.value.tenantGuid).then((res: any) => {
       loading.value = false;
@@ -505,7 +504,7 @@ const rejectDialogBtnClick = (btn, info) => {
       guid: currTableData.value.approveVO.approveGuid,
       flowType: currTableData.value.approveVO.flowType,
       approveSuggest: info.approveSuggest,
-      approveStaffGuid: userData.staffGuid
+      approveStaffGuid: userData.staffGuid,
     }
     rejectFlowData(params, currTableData.value.tenantGuid).then((res: any) => {
       loading.value = false;
@@ -563,8 +562,7 @@ const rejectDialogBtnClick = (btn, info) => {
         </template>
       </CarouselPanel>
       <div class="table_panel_wrap">
-        <Table :tableInfo="tableInfo" @tableBtnClick="tableBtnClick" />
-        <PageNav :class="[pageInfo.type]" :pageInfo="pageInfo" @pageChange="pageChange" />
+        <Table :tableInfo="tableInfo" @tableBtnClick="tableBtnClick" @tablePageChange="tablePageChange" />
       </div>
     </div>
     <Dialog :dialogInfo="passDialogInfo" @btnClick="passDialogBtnClick" />
@@ -593,7 +591,7 @@ const rejectDialogBtnClick = (btn, info) => {
 }
 
 .table_panel {
-  height: calc(100% - 44px) !important;
+  // height: calc(100% - 44px) !important;
 }
 
 .tools_btns {
@@ -729,9 +727,8 @@ const rejectDialogBtnClick = (btn, info) => {
   position: relative;
 }
 
-:deep(.el-carousel) {
-  margin: 0 -16px 16px;
-  padding: 0 16px;
+:deep(.el-carousel__container) {
+  margin-bottom: 16px;
 
   .card-content {
     width: calc(25% - 12px);