diff --git a/WebSite/src/api/Account.js b/WebSite/src/api/Account.js
index 13d79760c808cbcdd6ec2d55727d0d1b274c5803..640748f7ab940fff4a6f46a482f96242d3752083 100644
--- a/WebSite/src/api/Account.js
+++ b/WebSite/src/api/Account.js
@@ -12,8 +12,8 @@ class Account {
   // static login(data) {
   //   return request.post('/account/pc/v1/login', data);
   // }
-  static login(data) {
-    return request.post('/login/login', data);
+  static login(token,data) {
+    return request.post(`/login/login?token=${token}&roleName=${data}`);
   }
   
 }
diff --git a/WebSite/src/api/trust-letter-management-finance.js b/WebSite/src/api/trust-letter-management-finance.js
index 99c63ab8e4672fa05c62c231fc9a44567828f4c8..9b4632f041ae7dafc30b7e9a0b47e3f2e9c5d4a1 100644
--- a/WebSite/src/api/trust-letter-management-finance.js
+++ b/WebSite/src/api/trust-letter-management-finance.js
@@ -13,8 +13,18 @@ class trustLetterManagementFinance {
   static getEntrustmentPage(data) {
     return request.post('/entrustment/getEntrustmentPage', data);
   }
-  //鑾峰彇濮旀墭鍑界姸鎬佸垪琛� /entrustment/getEnstrustmentStateEnumList
-  
+  //鑾峰彇濮旀墭鍑界姸鎬佸垪琛� 
+  static getEnstrustmentStateEnumList(data) {
+    return request.post('/entrustment/getEnstrustmentStateEnumList', data);
+  }
+  //椤圭洰娓呭崟 
+  static getProjectListByEntrustmentId(data) {
+    return request.post('/entrustment/getProjectListByEntrustmentId', data);
+  }
+   //涓嬭浇椤圭洰鐢虫姤pdf
+   static downloadProjectPdf(data) {
+    return request.get(`/projectType/downloadProjectPdf?id=${data}`);
+}
 }
 
 export default trustLetterManagementFinance;
diff --git a/WebSite/src/core/base/Realm.js b/WebSite/src/core/base/Realm.js
index c3510a59838d9c3060f4a55eabef740a5c780dd1..1aee7fda1eb3ded57b7628f6a3d5aa94ea746b06 100644
--- a/WebSite/src/core/base/Realm.js
+++ b/WebSite/src/core/base/Realm.js
@@ -9,7 +9,8 @@
 import AuthenticationInfo from '../model/AuthenticationInfo';
 import AuthorizationInfo from '../model/AuthorizationInfo';
 import Account from '@/api/Account';
-import User from '@/api/user';
+// import User from '@/api/user';
+// import { useRouter } from 'vue-router';
 
 /**
  * safety data source
@@ -23,11 +24,12 @@ class Realm {
    * @return {Promise}
    */
   static async doGetAuthenticationInfo(authenticationToken) {
+  //  const router = useRouter();
     const { principals, credentials } = authenticationToken;
     if (principals && credentials) {
-      debugger
       // do somethings here
-      const res = await Account.login({});
+      const res = await Account.login(principals,'');
+      localStorage.setItem("token",principals)
       console.log('res', res)
       console.log('new AuthenticationInfo(res.data[0])', new AuthenticationInfo(res.data[0]))
       return new AuthenticationInfo(res.data[0]);
@@ -43,16 +45,19 @@ class Realm {
    * @return {Promise}
    */
   static async doGetAuthorizationInfo(authorizationToken) {
+    console.log(authorizationToken);
     // if (authorizationToken) {
     //   // do somethings here
     //   await User.setCurrent({ id: authorizationToken });
     //   const res = await User.getCurrent({ id: authorizationToken });
     //   return new AuthorizationInfo(res.data[0], 'token');
     // }
+    let principals  = localStorage.getItem("token");
     if (authorizationToken) {
       // do somethings here
       // await User.setCurrent({ authorizationToken });
-      const res = await User.getCurrent(authorizationToken );
+      const res = await Account.login(principals, authorizationToken);
+      console.log(res.data[0],'tooken')
       return new AuthorizationInfo(res.data[0], 'token');
     }
     // you must return an AuthorizationInfo instance
diff --git a/WebSite/src/store/modules/subject.js b/WebSite/src/store/modules/subject.js
index 73cba30cec9da6de566717cabe039ccdb5d66f18..d2f5f206b522994e308f2d0d574cb73021ad96cf 100644
--- a/WebSite/src/store/modules/subject.js
+++ b/WebSite/src/store/modules/subject.js
@@ -137,35 +137,29 @@ const actions = {
    */
   permit: async ({ commit, state }, payload = {}) => {
     try {
-      debugger
 
       let { authorizationToken, afterPermitted } = payload;
+      console.log('afterPermitted', afterPermitted, authorizationToken);
       typeof afterPermitted !== 'function' &&
         (afterPermitted = () => {
-          debugger
-
-          // router.push('/i');
           commit('SET_JUDGEUSER', authorizationToken);
-          console.log('authorizationToken', authorizationToken);
-          console.log('SET_JUDGEUSER', state.judgeUser);
-          if (authorizationToken.roleName == '璐㈠姟澶�') {
+          if (authorizationToken == '璐㈠姟澶�') {
             router.push(
               '/i/item-entry/exante-performance-management'
             );
-          } else if (authorizationToken.roleName == '璐㈢涓績') {
+          } else if (authorizationToken == '璐㈢涓績') {
             router.push('/i/item-entry/claim-in-advance-declaration');
-          } else if (authorizationToken.roleName == '涓氬姟澶勫') {
+          } else if (authorizationToken == '涓氬姟澶勫') {
             router.push('/i/item-entry/exante-performance-evaluation-function');
-          } else if (authorizationToken.roleName == '浜嬪姟鎵€') {
+          } else if (authorizationToken == '浜嬪姟鎵€') {
             router.push('/i/item-entry/pre-declaration-operation');
-          } else if (authorizationToken.roleName == '6') {
+          } else if (authorizationToken == '6') {
             router.push(
               '/i/item-entry/exante-performance-evaluation-specialist'
             );
           }
         });
       const info = await Realm.doGetAuthorizationInfo(authorizationToken);
-
       if (info.constructor !== AuthorizationInfo) {
         throw new Error('Invalid AuthorizationInfo');
       }
@@ -283,12 +277,14 @@ const actions = {
           path: '/auth-redirect',
           query: { ssoAddress: state.ssoAddress, ssoLogout }
         }
-        : { path: '/login', query };
-    if (doRouterPush) {
-      router.push(redirect);
-    } else {
-      return redirect;
-    }
+        // : { path: 'http://192.168.1.77:8082/Menu/Supervision', query };
+        : ''
+    // if (doRouterPush) {
+    //   router.push(redirect);
+    // } else {
+    //   return redirect;
+    // }
+    window.location.href = 'http://192.168.1.77:8082/Menu/Supervision'
   }
 };
 
diff --git a/WebSite/src/views/item-entry/exante-performance-inquiry/index.vue b/WebSite/src/views/item-entry/exante-performance-inquiry/index.vue
index 80a3fe42aa29ab4a6b1653847a6fffc5bf057416..bf39a326a1c76e06e84a43c80fc112728aad2023 100644
--- a/WebSite/src/views/item-entry/exante-performance-inquiry/index.vue
+++ b/WebSite/src/views/item-entry/exante-performance-inquiry/index.vue
@@ -184,6 +184,7 @@
       v-model="onBackDialog"
       width="45%"
       destroy-on-close
+      @close="closeBack"
     >
       <el-form :model="formDataBack" ref="formRef" label-width="80px">
         <el-form-item label="閫€鍥炴剰瑙侊細">
@@ -192,7 +193,6 @@
             :autosize="{ minRows: 2, maxRows: 4 }"
             type="textarea"
             placeholder=""
-            disabled
           />
         </el-form-item>
       </el-form>
@@ -343,7 +343,11 @@ export default {
           data.dataCount = res.total;
         });
     };
-    const changePage = () => {};
+    const changePage = (val) => {
+       data.queryInfo.pageIndex = val.page
+       data.queryInfo.pageSize = val.limit
+       getFinanceProjectInfoPage();
+    };
     const onEditeSure = () => {
       data.exantePerformanceTableInfo.tableInfo.forEach((res) => {
         console.log(res);
@@ -354,12 +358,13 @@ export default {
     };
     const onBackSure = () => {
       exantePerformanceInquiry
-        .financeAudit({ auditType: 2, parentId: data.formDataBack.id })
+        .financeAudit({ auditType: 2, parentId: data.formDataBack.id ,remark: data.formDataBack.remark })
         .then((res) => {
           if (res.code == '00000') {
             ElMessage.success('閫€鍥炴垚鍔�');
+            getFinanceProjectInfoPage();
+            data.onBackDialog = false;
           }
-          data.onBackDialog = false;
         });
     };
     const onViewSure = () => {};
@@ -380,7 +385,7 @@ export default {
       data.exantePerformanceSelects = val;
     };
     const onBack = (row) => {
-      data.formDataBack = row.id;
+      data.formDataBack.id = row.id;
       data.onBackDialog = true;
     };
     const onPass = (row) => {
@@ -394,6 +399,7 @@ export default {
             .financeAudit({ auditType: 1, parentId: row.id })
             .then(() => {
               ElMessage.success('閫氳繃鎴愬姛');
+              getFinanceProjectInfoPage();
             })
             .catch(() => {
               ElMessage.error('閫氳繃澶辫触');
@@ -436,6 +442,13 @@ export default {
       data.formDataWrite.disabled = true;
       data.onWriteDialog = true;
     };
+    const closeBack = () => {
+      data.formDataBack = {
+        id: '',
+        remark: '',
+      };
+      data.onBackDialog = true;
+    }
     const closeWrite = () => {
       data.formDataWrite = {
         name: '',
@@ -452,9 +465,10 @@ export default {
         .then((res) => {
           if (res.code == '00000') {
             ElMessage.success('濉啓鎴愬姛');
+            getFinanceProjectInfoPage();
+            data.onWriteDialog = false;
           }
         });
-      data.onWriteDialog = false;
     };
     return {
       getProjectStateEnumList,
@@ -462,6 +476,7 @@ export default {
       onWriteSure,
       onWrite,
       onLook,
+      closeBack,
       closeWrite,
       onView,
       onBack,
diff --git a/WebSite/src/views/item-entry/trust-letter-management-finance/index.vue b/WebSite/src/views/item-entry/trust-letter-management-finance/index.vue
index 7fba725659e96509b38e609603ebf768e2888e77..9b5e52462cfef09b236cbb8adffa68f6fc299979 100644
--- a/WebSite/src/views/item-entry/trust-letter-management-finance/index.vue
+++ b/WebSite/src/views/item-entry/trust-letter-management-finance/index.vue
@@ -3,20 +3,42 @@
     <el-card>
       <el-form :inline="true" class="demo-form-inline">
         <el-form-item label="鐢虫姤骞翠唤锛�">
-          <el-date-picker v-model="queryInfo.year" type="year" value-format="YYYY" placeholder="璇烽€夋嫨骞翠唤"
-            @change="selectYear" />
+          <el-date-picker
+            v-model="queryInfo.budYear"
+            type="budYear"
+            value-format="YYYY"
+            placeholder="璇烽€夋嫨骞翠唤"
+            @change="selectYear"
+          />
         </el-form-item>
         <el-form-item label="涓氬姟澶勫锛�">
-          <el-input v-model="queryInfo.businessOfficeName"></el-input>
+          <el-input v-model="queryInfo.deptName"></el-input>
         </el-form-item>
         <el-form-item label="濮旀墭鍑界姸鎬侊細">
-          <el-select v-model="queryInfo.projectState" placeholder="璇烽€夋嫨" style="width: 100%;">
-            <el-option v-for="item in projectStates" :key="item.value" :label="item.label" :value="item.value">
+          <el-select
+            v-model="queryInfo.entrustmentState"
+            clearable
+            placeholder="璇烽€夋嫨"
+            style="width: 100%"
+          >
+            <el-option
+              v-for="item in projectStates"
+              :key="item.key"
+              :label="item.name"
+              :value="item.key"
+            >
             </el-option>
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-button plain type="primary" icon="Search" size="small" @click="onQuery">鏌ヨ</el-button>
+          <el-button
+            plain
+            type="primary"
+            icon="Search"
+            size="small"
+            @click="onQuery"
+            >鏌ヨ</el-button
+          >
         </el-form-item>
         <!-- <el-form-item>
           <el-button
@@ -32,46 +54,122 @@
     </el-card>
     <el-card class="box-card" style="margin-top: 20px">
       <div class="filter-container">
-        <el-table :data="exantePerformanceTableInfo.tableInfo" highlight-current-row width="100%" border stripe
-          @selection-change="handleSelectionChange" header-cell-class-name="headStyle">
+        <el-table
+          :data="exantePerformanceTableInfo.tableInfo"
+          highlight-current-row
+          width="100%"
+          border
+          stripe
+          @selection-change="handleSelectionChange"
+          header-cell-class-name="headStyle"
+        >
           <el-table-column type="selection"> </el-table-column>
           <!-- <el-table-column type="index" width="50"> {{ (page - 1) * pageSize + scope.$index + 1 }}</el-table-column> -->
-          <el-table-column label="搴忓彿" type="index" width="50"></el-table-column>
-          <el-table-column class="positionStyle" prop="serialNumber" label="濮旀墭鍑界紪鍙�" align="center"></el-table-column>
-          <el-table-column class="positionStyle" prop="year" label="鐢虫姤骞翠唤" align="center"></el-table-column>
-          <el-table-column class="positionStyle" prop="officeName" label="涓氬姟澶勫" align="center"></el-table-column>
-          <el-table-column class="positionStyle" prop="projectName" label="椤圭洰鏁伴噺" align="center"></el-table-column>
-          <el-table-column class="positionStyle" prop="trustLetterStatus" label="濮旀墭鍑界姸鎬�" align="center"></el-table-column>
+          <el-table-column
+            label="搴忓彿"
+            type="index"
+            width="50"
+          ></el-table-column>
+          <el-table-column
+            class="positionStyle"
+            prop="entrustmentNum"
+            label="濮旀墭鍑界紪鍙�"
+            align="center"
+          ></el-table-column>
+          <el-table-column
+            class="positionStyle"
+            prop="budYear"
+            label="鐢虫姤骞翠唤"
+            align="center"
+          ></el-table-column>
+          <el-table-column
+            class="positionStyle"
+            prop="deptName"
+            label="涓氬姟澶勫"
+            align="center"
+          ></el-table-column>
+          <el-table-column
+            class="positionStyle"
+            prop="projectNum"
+            label="椤圭洰鏁伴噺"
+            align="center"
+          ></el-table-column>
+          <el-table-column
+            class="positionStyle"
+            prop="entrustmentStateName"
+            label="濮旀墭鍑界姸鎬�"
+            align="center"
+          ></el-table-column>
           <el-table-column label="鎿嶄綔" align="center " width="450px">
-            <template #default="scoped">
-              <!-- <el-button v-if="scoped.row.judgePass" plain type="success" icon="check" size="small"
-                @click="onPass(scoped.row)">鎻愪氦</el-button> -->
+            <template #default="scope">
+              <!-- <el-button v-if="scope.row.judgePass" plain type="success" icon="check" size="small"
+                @click="onPass(scope.row)">鎻愪氦</el-button> -->
               <!-- <el-button
                 plain
                 type="danger"
                 icon="close"
                 size="small"
-                v-if="scoped.row.judgeBack"
-                @click="onBack(scoped.row)"
+                v-if="scope.row.judgeBack"
+                @click="onBack(scope.row)"
                 >閫€鍥�</el-button
               > -->
-              <el-button plain type="primary" icon="download" size="small" v-if="scoped.row.judgeDownLoad"
-                @click="onDownLoad(scoped.row)">涓嬭浇</el-button>
-              <!-- <el-button plain type="primary" icon="View" size="small" v-if="scoped.row.judgePreView"
-                @click="onJudgePreView(scoped.row)">鏌ョ湅</el-button> -->
-              <el-button plain type="primary" icon="View" size="small" v-if="scoped.row.judgePreView">鏌ョ湅</el-button>
-              <!-- <el-button plain type="primary" icon="View" size="small" v-if="scoped.row.judgeView"
-                @click="onJudgeView(scoped.row)">瀹℃牳</el-button> -->
-              <el-button plain type="primary" icon="View" size="small" v-if="scoped.row.judgeView"
-                @click="onJudgePreView(scoped.row)">瀹℃牳</el-button>
+              <el-button
+                plain
+                type="primary"
+                icon="download"
+                size="small"
+                v-if="
+                  scope.row.entrustmentState == 5 ||
+                  scope.row.entrustmentState == 6 ||
+                  scope.row.entrustmentState == 9
+                "
+                @click="onDownLoad(scope.row)"
+                >涓嬭浇</el-button
+              >
+              <el-button
+                plain
+                type="primary"
+                icon="View"
+                size="small"
+                v-if="
+                  scope.row.entrustmentState != 1 &&
+                  scope.row.entrustmentState != 2
+                "
+                @click="onLook(scope.row)"
+                >鏌ョ湅</el-button
+              >
+              <el-button
+                plain
+                type="primary"
+                icon="View"
+                size="small"
+                v-if="
+                  scope.row.entrustmentState == 1 ||
+                  scope.row.entrustmentState == 2
+                "
+                @click="onJudgePreView(scope.row)"
+                >瀹℃牳</el-button
+              >
             </template>
           </el-table-column>
         </el-table>
-        <Pagination style="padding-bottom: 10px" :page="exantePerformanceTableInfo.pageIndex"
-          :limit="exantePerformanceTableInfo.pageSize" :total="dataCount" @pagination="changePage" />
+        <Pagination
+          style="padding-bottom: 10px"
+          :page="exantePerformanceTableInfo.pageIndex"
+          :limit="exantePerformanceTableInfo.pageSize"
+          :total="dataCount"
+          @pagination="changePage"
+        />
       </div>
     </el-card>
-    <el-dialog top="220px" title="" v-model="onPassDialog" width="45%" destroy-on-close>
+    <!-- 閫氳繃 -->
+    <el-dialog
+      top="220px"
+      title=""
+      v-model="onPassDialog"
+      width="45%"
+      destroy-on-close
+    >
       <el-form ref="formRef" label-width="80px">
         <span>鏄惁纭閫氳繃 </span>
       </el-form>
@@ -82,10 +180,17 @@
         </span>
       </template>
     </el-dialog>
-    <el-dialog top="220px" title="閫€鍥�" v-model="onBackDialog" width="45%" destroy-on-close>
+    <!-- 閫€鍥� -->
+    <el-dialog
+      top="220px"
+      title="閫€鍥�"
+      v-model="onBackDialog"
+      width="45%"
+      destroy-on-close
+    >
       <el-form ref="formRef" label-width="80px">
         <span>閫€鍥炴剰瑙侊細 </span>
-        <textarea name="" id="" style="width: 100%;" rows="4"></textarea>
+        <textarea name="" id="" style="width: 100%" rows="4"></textarea>
       </el-form>
       <template #footer>
         <span class="dialog-footer">
@@ -94,13 +199,41 @@
         </span>
       </template>
     </el-dialog>
-    <el-dialog top="220px" title="鏌ョ湅瀹℃牳鎰忚" v-model="onViewDialog" width="45%" destroy-on-close>
+    <!-- 鏌ョ湅瀹℃牳鎰忚 -->
+    <el-dialog
+      top="220px"
+      title="鏌ョ湅瀹℃牳鎰忚"
+      v-model="onViewDialog"
+      width="45%"
+      destroy-on-close
+    >
       <el-form ref="formRef" label-width="80px">
-        <el-table :data="onViewTableInfo" highlight-current-row width="100%" border stripe
-          header-cell-class-name="headStyle">
-          <el-table-column class="positionStyle" prop="auditor" label="瀹℃牳浜�" align="center"></el-table-column>
-          <el-table-column class="positionStyle" prop="auditTime" label="瀹℃牳鏃堕棿" align="center"></el-table-column>
-          <el-table-column class="positionStyle" prop="auditopinion" label="瀹℃牳鎰忚" align="center"></el-table-column>
+        <el-table
+          :data="onViewTableInfo"
+          highlight-current-row
+          width="100%"
+          border
+          stripe
+          header-cell-class-name="headStyle"
+        >
+          <el-table-column
+            class="positionStyle"
+            prop="auditor"
+            label="瀹℃牳浜�"
+            align="center"
+          ></el-table-column>
+          <el-table-column
+            class="positionStyle"
+            prop="auditTime"
+            label="瀹℃牳鏃堕棿"
+            align="center"
+          ></el-table-column>
+          <el-table-column
+            class="positionStyle"
+            prop="auditopinion"
+            label="瀹℃牳鎰忚"
+            align="center"
+          ></el-table-column>
         </el-table>
       </el-form>
       <template #footer>
@@ -110,97 +243,287 @@
         </span>
       </template>
     </el-dialog>
-    <el-dialog top="220px" title="" v-model="onJudgePreViewDialog" width="45%" destroy-on-close>
+    <!-- 瀹℃牳鍜屾煡鐪嬪脊绐� -->
+    <el-dialog
+      top="220px"
+      title=""
+      v-model="onJudgePreViewDialog"
+      width="45%"
+      destroy-on-close
+    >
       <el-form ref="formRef" label-width="80px">
         <el-tabs type="border-card">
           <el-tab-pane label="椤圭洰娓呭崟">
             <el-form :inline="true" class="demo-form-inline">
               <el-form-item>
-                <el-button plain type="primary" icon="Search" size="small" @click="onQuery">鎵归噺閫氳繃</el-button>
+                <el-button
+                  plain
+                  type="primary"
+                  icon="Search"
+                  size="small"
+                  @click="onQuery"
+                  v-if="flag == 1"
+                  >鎵归噺閫氳繃</el-button
+                >
               </el-form-item>
               <el-form-item>
-                <el-button plain type="primary" icon="Search" size="small" @click="onQuery">鎵归噺閫€鍥�</el-button>
+                <el-button
+                  plain
+                  type="primary"
+                  icon="Search"
+                  size="small"
+                  @click="onQuery"
+                  v-if="flag == 1"
+                  >鎵归噺閫€鍥�</el-button
+                >
               </el-form-item>
             </el-form>
-            <el-table :data="onPreAuditTableInfo" highlight-current-row width="100%" border stripe
-              header-cell-class-name="headStyle">
-              <el-table-column class="positionStyle" prop="serialNumber" label="椤圭洰缂栧彿" align="center"></el-table-column>
-              <el-table-column class="positionStyle" prop="year" label="鐢虫姤骞翠唤" align="center"></el-table-column>
-              <el-table-column class="positionStyle" prop="officeName" label="涓氬姟澶勫" align="center"></el-table-column>
-              <el-table-column class="positionStyle" prop="projectName" label="椤圭洰鍚嶇О" align="center"></el-table-column>
-              <el-table-column class="positionStyle" prop="projectState" label="椤圭洰鐘舵€�" align="center"></el-table-column>
+            <el-table
+              :data="onPreAuditTableInfo"
+              highlight-current-row
+              width="100%"
+              border
+              stripe
+              header-cell-class-name="headStyle"
+            >
+              <el-table-column
+                class="positionStyle"
+                prop="projectNumber"
+                label="椤圭洰缂栧彿"
+                align="center"
+              ></el-table-column>
+              <el-table-column
+                class="positionStyle"
+                prop="budYear"
+                label="鐢虫姤骞翠唤"
+                align="center"
+              ></el-table-column>
+              <el-table-column
+                class="positionStyle"
+                prop="deptName"
+                label="涓氬姟澶勫"
+                align="center"
+              ></el-table-column>
+              <el-table-column
+                class="positionStyle"
+                prop="projectName"
+                label="椤圭洰鍚嶇О"
+                align="center"
+              ></el-table-column>
+              <el-table-column
+                class="positionStyle"
+                prop="stateName"
+                label="椤圭洰鐘舵€�"
+                align="center"
+              ></el-table-column>
               <el-table-column label="鎿嶄綔" align="center " width="450px">
-                <template #default="scoped">
-                  <!-- <el-button v-if="scoped.row.judgePass" plain type="success" icon="check" size="small"
-                    @click="onPass(scoped.row)">閫氳繃</el-button>
-                  <el-button plain type="danger" icon="close" size="small" v-if="scoped.row.judgeBack"
-                    @click="onBack(scoped.row)">閫€鍥�</el-button> -->
-                  <el-button plain type="primary" icon="download" size="small"
-                    @click="onDownLoad(scoped.row)">涓嬭浇</el-button>
-                  <el-button plain type="info" icon="View" size="small" @click="onPreView(scoped.row)">棰勮</el-button>
-                  <el-button plain type="info" icon="View" size="small" @click="onView(scoped.row)">鏌ョ湅棰勫鎰忚</el-button>
+                <template #default="scope">
+                  <!-- <el-button v-if="scope.row.judgePass" plain type="success" icon="check" size="small"
+                    @click="onPass(scope.row)">閫氳繃</el-button>
+                  <el-button plain type="danger" icon="close" size="small" v-if="scope.row.judgeBack"
+                    @click="onBack(scope.row)">閫€鍥�</el-button> -->
+                  <el-button
+                    plain
+                    type="primary"
+                    icon="download"
+                    size="small"
+                    v-if="scope.row.stateCode"
+                    @click="onDownLoad(scope.row)"
+                    >涓嬭浇</el-button
+                  >
+                  <el-button
+                    plain
+                    type="info"
+                    icon="View"
+                    size="small"
+                    v-if="scope.row.stateCode"
+                    @click="onPreView(scope.row)"
+                    >棰勮</el-button
+                  >
+                  <el-button
+                    plain
+                    type="info"
+                    icon="View"
+                    size="small"
+                    @click="onView(scope.row)"
+                    >鏌ョ湅棰勫鎰忚</el-button
+                  >
                 </template>
               </el-table-column>
-            </el-table></el-tab-pane>
-          <el-tab-pane label="棰勫缁撴灉"><el-table :data="onPreAuditTableInfo" highlight-current-row width="100%" border stripe
-              header-cell-class-name="headStyle">
-              <el-table-column class="positionStyle" prop="serialNumber" label="椤圭洰缂栧彿" align="center"></el-table-column>
-              <el-table-column class="positionStyle" prop="year" label="鐢虫姤骞翠唤" align="center"></el-table-column>
-              <el-table-column class="positionStyle" prop="officeName" label="涓氬姟澶勫" align="center"></el-table-column>
-              <el-table-column class="positionStyle" prop="projectName" label="椤圭洰鍚嶇О" align="center"></el-table-column>
-              <el-table-column class="positionStyle" prop="projectState" label="椤圭洰鐘舵€�" align="center"></el-table-column>
+            </el-table></el-tab-pane
+          >
+          <el-tab-pane label="棰勫缁撴灉"
+            ><el-table
+              :data="onPreAuditTableInfo"
+              highlight-current-row
+              width="100%"
+              border
+              stripe
+              header-cell-class-name="headStyle"
+            >
+              <el-table-column
+                class="positionStyle"
+                prop="entrustmentNum"
+                label="椤圭洰缂栧彿"
+                align="center"
+              ></el-table-column>
+              <el-table-column
+                class="positionStyle"
+                prop="budYear"
+                label="鐢虫姤骞翠唤"
+                align="center"
+              ></el-table-column>
+              <el-table-column
+                class="positionStyle"
+                prop="deptName"
+                label="涓氬姟澶勫"
+                align="center"
+              ></el-table-column>
+              <el-table-column
+                class="positionStyle"
+                prop="projectNum"
+                label="椤圭洰鍚嶇О"
+                align="center"
+              ></el-table-column>
+              <el-table-column
+                class="positionStyle"
+                prop="projectState"
+                label="椤圭洰鐘舵€�"
+                align="center"
+              ></el-table-column>
               <el-table-column label="鎿嶄綔" align="center " width="450px">
-                <template #default="scoped">
-                  <!-- <el-button v-if="scoped.row.judgePass" plain type="success" icon="check" size="small"
-                    @click="onPass(scoped.row)">閫氳繃</el-button>
-                  <el-button plain type="danger" icon="close" size="small" v-if="scoped.row.judgeBack"
-                    @click="onBack(scoped.row)">閫€鍥�</el-button> -->
-                  <el-button plain type="primary" icon="download" size="small"
-                    @click="onDownLoad(scoped.row)">涓嬭浇</el-button>
-                  <el-button plain type="info" icon="View" size="small" @click="onPreView(scoped.row)">棰勮</el-button>
-                  <el-button plain type="info" icon="View" size="small" @click="onView(scoped.row)">鏌ョ湅棰勫鎰忚</el-button>
+                <template #default="scope">
+                  <!-- <el-button v-if="scope.row.judgePass" plain type="success" icon="check" size="small"
+                    @click="onPass(scope.row)">閫氳繃</el-button>
+                  <el-button plain type="danger" icon="close" size="small" v-if="scope.row.judgeBack"
+                    @click="onBack(scope.row)">閫€鍥�</el-button> -->
+                  <el-button
+                    plain
+                    type="primary"
+                    icon="download"
+                    size="small"
+                    @click="onDownLoad(scope.row)"
+                    >涓嬭浇</el-button
+                  >
+                  <el-button
+                    plain
+                    type="info"
+                    icon="View"
+                    size="small"
+                    @click="onPreView(scope.row)"
+                    >棰勮</el-button
+                  >
+                  <el-button
+                    plain
+                    type="info"
+                    icon="View"
+                    size="small"
+                    @click="onView(scope.row)"
+                    >鏌ョ湅棰勫鎰忚</el-button
+                  >
                 </template>
               </el-table-column>
-            </el-table></el-tab-pane>
-          <el-tab-pane label="璇勫缁撴灉"><el-table :data="onViewAppraisalResultTableInfo" highlight-current-row width="100%"
-              border stripe header-cell-class-name="headStyle">
-              <el-table-column class="positionStyle" prop="serialNumber" label="椤圭洰缂栧彿" align="center"></el-table-column>
-              <el-table-column class="positionStyle" prop="year" label="鐢虫姤骞翠唤" align="center"></el-table-column>
-              <el-table-column class="positionStyle" prop="officeName" label="涓氬姟澶勫" align="center"></el-table-column>
-              <el-table-column class="positionStyle" prop="projectName" label="椤圭洰鍚嶇О" align="center"></el-table-column>
-              <el-table-column class="positionStyle" prop="projectState" label="椤圭洰鐘舵€�" align="center"></el-table-column>
-              <el-table-column class="positionStyle" prop="appraisalResult" label="璇勫缁撴灉" align="center"></el-table-column>
+            </el-table></el-tab-pane
+          >
+          <el-tab-pane label="璇勫缁撴灉"
+            ><el-table
+              :data="onViewAppraisalResultTableInfo"
+              highlight-current-row
+              width="100%"
+              border
+              stripe
+              header-cell-class-name="headStyle"
+            >
+              <el-table-column
+                class="positionStyle"
+                prop="entrustmentNum"
+                label="椤圭洰缂栧彿"
+                align="center"
+              ></el-table-column>
+              <el-table-column
+                class="positionStyle"
+                prop="budYear"
+                label="鐢虫姤骞翠唤"
+                align="center"
+              ></el-table-column>
+              <el-table-column
+                class="positionStyle"
+                prop="deptName"
+                label="涓氬姟澶勫"
+                align="center"
+              ></el-table-column>
+              <el-table-column
+                class="positionStyle"
+                prop="projectNum"
+                label="椤圭洰鍚嶇О"
+                align="center"
+              ></el-table-column>
+              <el-table-column
+                class="positionStyle"
+                prop="projectState"
+                label="椤圭洰鐘舵€�"
+                align="center"
+              ></el-table-column>
+              <el-table-column
+                class="positionStyle"
+                prop="appraisalResult"
+                label="璇勫缁撴灉"
+                align="center"
+              ></el-table-column>
               <el-table-column label="鎿嶄綔" align="center " width="450px">
-                <template #default="scoped">
-                  <!-- <el-button v-if="scoped.row.judgePass" plain type="success" icon="check" size="small"
-                    @click="onPass(scoped.row)">閫氳繃</el-button>
-                  <el-button plain type="danger" icon="close" size="small" v-if="scoped.row.judgeBack"
-                    @click="onBack(scoped.row)">閫€鍥�</el-button> -->
-                  <el-button plain type="primary" icon="download" size="small"
-                    @click="onDownLoad(scoped.row)">涓嬭浇</el-button>
-                  <el-button plain type="info" icon="View" size="small" @click="onPreView(scoped.row)">棰勮</el-button>
-                  <el-button plain type="info" icon="View" size="small" @click="onView(scoped.row)">鏌ョ湅璇勫鎰忚</el-button>
+                <template #default="scope">
+                  <!-- <el-button v-if="scope.row.judgePass" plain type="success" icon="check" size="small"
+                    @click="onPass(scope.row)">閫氳繃</el-button>
+                  <el-button plain type="danger" icon="close" size="small" v-if="scope.row.judgeBack"
+                    @click="onBack(scope.row)">閫€鍥�</el-button> -->
+                  <el-button
+                    plain
+                    type="primary"
+                    icon="download"
+                    size="small"
+                    @click="onDownLoad(scope.row)"
+                    >涓嬭浇</el-button
+                  >
+                  <el-button
+                    plain
+                    type="info"
+                    icon="View"
+                    size="small"
+                    @click="onPreView(scope.row)"
+                    >棰勮</el-button
+                  >
+                  <el-button
+                    plain
+                    type="info"
+                    icon="View"
+                    size="small"
+                    @click="onView(scope.row)"
+                    >鏌ョ湅璇勫鎰忚</el-button
+                  >
                 </template>
               </el-table-column>
-            </el-table></el-tab-pane>
+            </el-table></el-tab-pane
+          >
         </el-tabs>
       </el-form>
       <template #footer>
         <span class="dialog-footer">
           <el-button @click="onJudgePreViewDialog = false">鍙� 娑�</el-button>
-          <el-button type="primary" @click="onJudgePreViewSure">纭� 瀹�</el-button>
+          <el-button type="primary" @click="onJudgePreViewSure"
+            >纭� 瀹�</el-button
+          >
         </span>
       </template>
     </el-dialog>
-   </div>
+  </div>
 </template>
 
 <script>
-import { reactive, toRefs } from 'vue';
+import { onMounted, reactive, toRefs } from 'vue';
 import { use } from 'echarts/core';
 import { useRouter } from 'vue-router';
-//import trustLetterManagementFinance from '@/api/trust-letter-management-finance';
- 
+import trustLetterManagementFinance from '@/api/trust-letter-management-finance';
+
 use([]);
 export default {
   name: 'TrustLetterManagementFinance',
@@ -208,32 +531,22 @@ export default {
   setup() {
     const router = useRouter();
     const data = reactive({
-      queryInfo: {},
+      flag: 0,
+      queryInfo: {
+        budYear: 2023,
+        deptName: '',
+        entrustmentState: '',
+        pageIndex: 1,
+        pageSize: 10,
+      },
       queryGenerateDelegateInfo: {},
-      projectStates: [
-        { label: '寰呮彁浜�', value: 1 },
-        { label: '寰呭鏍�', value: 2 },
-        { label: '閫€鍥�', value: 3 },
-        { label: '閫氳繃', value: 4 },
-        { label: '璐㈠姟澶勫鎵樺嚱閫€鍥炰腑', value: 5 },
-        { label: '璐㈠姟澶勫鎵樺嚱寰呭鏍镐腑', value: 6 },
-        { label: '璐㈠姟澶勫鎵樺嚱瀹℃牳閫氳繃', value: 7 },
-        { label: '棰勫涓�', value: 8 },
-        { label: '璐㈣祫涓績濮旀墭鍑介€€鍥炰腑', value: 9 },
-        { label: '璐㈣祫涓績濮旀墭鍑藉緟瀹℃牳涓�', value: 10 },
-        { label: '璐㈣祫涓績濮旀墭鍑藉鏍搁€氳繃', value: 11 },
-        { label: '璇勫涓�', value: 12 },
-        { label: '瀹屾垚璇勫寰呭弽棣�', value: 13 },
-        { label: '瀹屾垚璇勫', value: 14 },
-        { label: '瀹屾垚璇勫锛堝緟淇敼锛�', value: 15 },
-        { label: '瀹屾垚璇勫寰呭鏍�', value: 16 }
-      ],
+      projectStates: [],
       // onEntrustingLetterTableInfo: [
       //   {
       //     projectNumber: '01001',
-      //     year: '2023-02-12',
+      //     budYear: '2023-02-12',
       //     positionStyle: '2023',
-      //     projectName: 'test1',
+      //     projectNum: 'test1',
       //     projectState: '閫氳繃'
       //   }
       // ],
@@ -244,216 +557,58 @@ export default {
       onViewDialog: false,
       editInfo: {},
       num: 0,
-      year: '',
+      budYear: '',
       dataCount: 5,
-      onPreAuditTableInfo: [
-        {
-          id: '111',
-          serialNumber: '010001',
-          judgePass: true,
-          judgeDownLoad: true,
-          judgePreView: true,
-          judgeView: true,
-          year: '2023-01-02',
-          officeName: '鍩圭澶�',
-          projectNmae: '2023骞撮珮鏁堝疄楠屽鏉′欢淇濋殰',
-          trustLetterStatus: '宸茬敓鎴�'
-        },
-        {
-          id: '112',
-          serialNumber: '010002',
-          year: '2023-01-02',
-          officeName: '绾缁�',
-          projectNmae: '2023骞撮珮鏁堝疄楠屽鏉′欢淇濋殰',
-          trustLetterStatus: '寰呰储璧勪腑蹇冭棰�',
-          judgePass: false,
-          judgeDownLoad: true,
-          judgePreView: true,
-          judgeView: true
-        },
-        {
-          id: '113',
-          serialNumber: '010003',
-          year: '2023-01-02',
-          officeName: '缁勫共澶�',
-          projectNmae: '2023骞撮珮鏁堝疄楠屽鏉′欢淇濋殰',
-          trustLetterStatus: '宸茬敓鎴�',
-          judgePass: true,
-          judgeDownLoad: true,
-          judgePreView: true,
-          judgeView: true
-        },
-        {
-          id: '114',
-          serialNumber: '010004',
-          year: '2023-01-02',
-          officeName: '绉樹功澶勶紙鐮旂┒瀹わ級',
-          projectNmae: '2023骞撮珮鏁堝疄楠屽鏉′欢淇濋殰',
-          trustLetterStatus: '寰呰储璧勪腑蹇冭棰�',
-          judgePass: false,
-          judgeDownLoad: false,
-          judgePreView: true,
-          judgeView: true
-        },
-        {
-          id: '115',
-          serialNumber: '010005',
-          year: '2023-01-12',
-          officeName: '鑱屾暀澶�',
-          projectNmae: '2023骞撮珮鏁堝疄楠屽鏉′欢淇濋殰',
-          projectState: '寰呰储璧勪腑蹇冭棰�',
-          judgePass: false,
-          judgeDownLoad: false,
-          judgePreView: true,
-          judgeView: true
-        }
-      ],
+      onPreAuditTableInfo: [],
       onViewTableInfo: [
         {
           auditor: '寮犺暰',
           auditTime: '2023-08-19',
-          auditopinion: '闇€琛ュ厖涓婁紶椤圭洰闄勪欢鏉愭枡'
-        }
-      ],
-      onViewAppraisalResultTableInfo: [
-        {
-          id: '111',
-          serialNumber: '010001',
-          judgePass: true,
-          judgeDownLoad: true,
-          judgePreView: true,
-          judgeView: true,
-          year: '2023-01-02',
-          officeName: '鍩圭澶�',
-          projectNmae: '2023骞撮珮鏁堝疄楠屽鏉′欢淇濋殰',
-          trustLetterStatus: '宸茬敓鎴�'
-        },
-        {
-          id: '112',
-          serialNumber: '010002',
-          year: '2023-01-02',
-          officeName: '绾缁�',
-          projectNmae: '2023骞撮珮鏁堝疄楠屽鏉′欢淇濋殰',
-          trustLetterStatus: '寰呰储璧勪腑蹇冭棰�',
-          judgePass: false,
-          judgeDownLoad: true,
-          judgePreView: true,
-          judgeView: true
-        },
-        {
-          id: '113',
-          serialNumber: '010003',
-          year: '2023-01-02',
-          officeName: '缁勫共澶�',
-          projectNmae: '2023骞撮珮鏁堝疄楠屽鏉′欢淇濋殰',
-          trustLetterStatus: '宸茬敓鎴�',
-          judgePass: true,
-          judgeDownLoad: false,
-          judgePreView: true,
-          judgeView: true
+          auditopinion: '闇€琛ュ厖涓婁紶椤圭洰闄勪欢鏉愭枡',
         },
-        {
-          id: '114',
-          serialNumber: '010004',
-          year: '2023-01-02',
-          officeName: '绉樹功澶勶紙鐮旂┒瀹わ級',
-          projectNmae: '2023骞撮珮鏁堝疄楠屽鏉′欢淇濋殰',
-          trustLetterStatus: '寰呰储璧勪腑蹇冭棰�',
-          judgePass: false,
-          judgeDownLoad: false,
-          judgePreView: true,
-          judgeView: true
-        },
-        {
-          id: '115',
-          serialNumber: '010005',
-          year: '2023-01-12',
-          officeName: '鑱屾暀澶�',
-          projectNmae: '2023骞撮珮鏁堝疄楠屽鏉′欢淇濋殰',
-          projectState: '寰呰储璧勪腑蹇冭棰�',
-          judgePass: false,
-          judgeDownLoad: false,
-          judgePreView: true,
-          judgeView: true
-        }
       ],
+      onViewAppraisalResultTableInfo: [],
       exantePerformanceTableInfo: {
-        tableInfo: [
-          {
-            id: '111',
-            serialNumber: '010001',
-            judgePass: true,
-            judgeDownLoad: true,
-            judgePreView: true,
-            judgeView: true,
-            year: '2023-01-02',
-            officeName: '鍩圭澶�',
-            projectNmae: '2023骞撮珮鏁堝疄楠屽鏉′欢淇濋殰',
-            trustLetterStatus: '宸茬敓鎴�'
-          },
-          {
-            id: '112',
-            serialNumber: '010002',
-            year: '2023-01-02',
-            officeName: '绾缁�',
-            projectNmae: '2023骞撮珮鏁堝疄楠屽鏉′欢淇濋殰',
-            trustLetterStatus: '寰呰储璧勪腑蹇冭棰�',
-            judgePass: false,
-            judgeDownLoad: true,
-            judgePreView: true,
-            judgeView: true
-          },
-          {
-            id: '113',
-            serialNumber: '010003',
-            year: '2023-01-02',
-            officeName: '缁勫共澶�',
-            projectNmae: '2023骞撮珮鏁堝疄楠屽鏉′欢淇濋殰',
-            trustLetterStatus: '宸茬敓鎴�',
-            judgePass: true,
-            judgeDownLoad: false,
-            judgePreView: true,
-            judgeView: true
-          },
-          {
-            id: '114',
-            serialNumber: '010004',
-            year: '2023-01-02',
-            officeName: '绉樹功澶勶紙鐮旂┒瀹わ級',
-            projectNmae: '2023骞撮珮鏁堝疄楠屽鏉′欢淇濋殰',
-            trustLetterStatus: '寰呰储璧勪腑蹇冭棰�',
-            judgePass: false,
-            judgeDownLoad: false,
-            judgePreView: true,
-            judgeView: true
-          },
-          {
-            id: '115',
-            serialNumber: '010005',
-            year: '2023-01-12',
-            officeName: '鑱屾暀澶�',
-            projectNmae: '2023骞撮珮鏁堝疄楠屽鏉′欢淇濋殰',
-            projectState: '寰呰储璧勪腑蹇冭棰�',
-            judgePass: false,
-            judgeDownLoad: false,
-            judgePreView: true,
-            judgeView: true
-          }
-        ],
+        tableInfo: [],
         pageIndex: 1,
-        pageSize: 10
+        pageSize: 10,
       },
-      exantePerformanceSelects: []
+      exantePerformanceSelects: [],
+    });
+    onMounted(() => {
+      getEnstrustmentStateEnumList();
+      getEntrustmentPage();
     });
-    const changePage = () => { };
-    const exantePerformanceEdite = row => {
+    const getEnstrustmentStateEnumList = () => {
+      trustLetterManagementFinance
+        .getEnstrustmentStateEnumList()
+        .then((res) => {
+          data.projectStates = res.data;
+        });
+    };
+    const getEntrustmentPage = () => {
+      trustLetterManagementFinance
+        .getEntrustmentPage(data.queryInfo)
+        .then((res) => {
+          data.exantePerformanceTableInfo.tableInfo = res.data;
+          data.queryInfo.pageIndex = res.pageIndex;
+          data.queryInfo.pageSize = res.pageSize;
+          data.dataCount = res.total;
+        });
+    };
+    const changePage = (val) => {
+      data.queryInfo.pageIndex = val.page;
+      data.queryInfo.pageSize = val.limit;
+      getEntrustmentPage();
+    };
+    const exantePerformanceEdite = (row) => {
       data.onEditeIndexDialog = true;
       data.editInfo.num = row.num;
       data.editInfo.id = row.id;
     };
     const onEditeSure = () => {
       data.onEditeIndexDialog = false;
-      data.exantePerformanceTableInfo.tableInfo.forEach(res => {
+      data.exantePerformanceTableInfo.tableInfo.forEach((res) => {
         if (res.id == data.editInfo.id) {
           res.num = data.editInfo.num;
         }
@@ -461,8 +616,9 @@ export default {
     };
     // 鏌ヨ
     const onQuery = async () => {
-      data.exantePerformanceSelects.forEach(r => {
-        data.exantePerformanceTableInfo.tableInfo.map(x => {
+      getEntrustmentPage();
+      data.exantePerformanceSelects.forEach((r) => {
+        data.exantePerformanceTableInfo.tableInfo.map((x) => {
           if (x.id == r.id) {
             return (x.enableOrNot = '鏄�');
           }
@@ -474,15 +630,30 @@ export default {
       );
     };
 
-    const handleSelectionChange = val => {
+    const handleSelectionChange = (val) => {
       console.log(val);
       data.exantePerformanceSelects = val;
     };
-
-    const onJudgePreView = () => {
+    //瀹℃牳
+    const onJudgePreView = (row) => {
+      data.flag == 1;
+      trustLetterManagementFinance
+        .getProjectListByEntrustmentId({ id: row.id })
+        .then((res) => {
+          data.onPreAuditTableInfo = res.data;
+          data.onJudgePreViewDialog = true;
+        });
+    };
+    //鏌ョ湅
+    const onLook = (row) => {
+      data.flag == 0;
+      trustLetterManagementFinance
+        .getProjectListByEntrustmentId({ id: row.id })
+        .then((res) => {
+          data.onPreAuditTableInfo = res.data;
+        });
       data.onJudgePreViewDialog = true;
     };
-
     const onJudgePreViewSure = () => {
       data.onJudgePreViewDialog = false;
     };
@@ -511,13 +682,15 @@ export default {
       data.onViewDialog = true;
     };
 
-    const onGenerateDelegateQuery = () => { };
+    const onGenerateDelegateQuery = () => {};
 
     // const onEntrustingLetter = () => {
     //   data.onEntrustingLetterDialog = true;
     // };
-    const selectYear = () => { };
+    const selectYear = () => {};
     return {
+      getEnstrustmentStateEnumList,
+      getEntrustmentPage,
       selectYear,
       onView,
       onBack,
@@ -528,19 +701,20 @@ export default {
       onGenerateDelegateQuery,
       onJudgePreViewSure,
       onJudgePreView,
+      onLook,
       onJudgeView,
       onEditeSure,
       changePage,
       handleSelectionChange,
       exantePerformanceEdite,
       // onEntrustingLetter,
-      ...toRefs(data)
+      ...toRefs(data),
     };
-  }
+  },
 };
 </script>
 
-<style lang="scss" scoped>
+<style lang="scss" scope>
 .workplace-container {
   padding: 20px 20px 0 20px;
   background-color: #f0f2f5;
diff --git a/WebSite/src/views/login/components/SelectUser.vue b/WebSite/src/views/login/components/SelectUser.vue
index b4d336b6d63bbe79754f9a021c20be9c301faafc..c84650226bf77676fe67f5bb85d11a4bf5b85014 100644
--- a/WebSite/src/views/login/components/SelectUser.vue
+++ b/WebSite/src/views/login/components/SelectUser.vue
@@ -43,6 +43,7 @@ export default {
     const selectedUserId = ref(0);
     const transitionList = reactive([]);
     const handleSelectUser = id => {
+      console.log('222', id);
       context.emit('handle-confirm', id);
     };
     watch(
diff --git a/WebSite/src/views/login/index.vue b/WebSite/src/views/login/index.vue
index 9111a361291de060e9c30e160d5a884195473ce1..e390db6e525055a418dc8222aba2945316f0001b 100644
--- a/WebSite/src/views/login/index.vue
+++ b/WebSite/src/views/login/index.vue
@@ -119,7 +119,6 @@ export default {
       console.log('q2', store.state.subject.account);
       const userList = store.state.subject.account;
       if (userList) {
-        debugger
         if (userList.roleNames && userList.roleNames.length > 1) {
           console.log('userList.roleNames', userList.roleNames);
           data.userList = userList.roleNames;
@@ -134,15 +133,15 @@ export default {
       // });
     };
     const handleSetUserGetMenuList = async userRole => {
-      console.log(userRole);
+      console.log(1);
       const a = {};
       a.roleName = userRole;
       a.userCode = store.state.subject.account.userCode;
-      await Account.login(a).then(res => {
+      await Account.login(localStorage.getItem("token"),userRole).then(res => {
         if (res.description == '鎴愬姛') {
-          debugger
+          
           const userList = {};
-          userList.roleName = a;
+          userList.roleName = userRole;
           userList.menuInfoList = res.data[0].menuInfoList;
           console.log('userList111', res.data[0].menuInfoList);
           console.log('userList111', userList);
@@ -170,17 +169,17 @@ export default {
       //   console.log('permitOptions', permitOptions);
       //   await store.dispatch('subject/permit', permitOptions);
       // } else {
-      debugger
       const permitOptions = { authorizationToken: userList.roleName, afterPermitted: userList.menuInfoList };
-      if (data.otherQuery.redirect_uri) {
-        permitOptions.afterPermitted = token => {
-          window.location.href = `${data.otherQuery.redirect_uri}?code=${token}`;
-        };
-      }
+      // if (data.otherQuery.redirect_uri) {
+      //   permitOptions.afterPermitted = token => {
+      //     window.location.href = `${data.otherQuery.redirect_uri}?code=${token}`;
+      //   };
+      // }
+      //router.push("/i")
       store.state.subject.authorizationToken = userList.roleName;
-      await store.dispatch('subject/permit', permitOptions);
+     await store.dispatch('subject/permit', permitOptions);
       // }
-    };
+    // };
     // const handleSetUser = async userId => {
     //   const permitOptions = { authorizationToken: userId };
     //   if (data.otherQuery.redirect_uri) {
@@ -189,8 +188,8 @@ export default {
     //     };
     //   }
     //   store.state.subject.authorizationToken = userId;
-    //   await store.dispatch('subject/permit', permitOptions);
-    // };
+      // await store.dispatch('subject/permit', permitOptions);
+    };
     const getQuery = query => {
       return Object.keys(query).reduce((acc, cur) => {
         if (cur !== 'redirect') {
@@ -218,9 +217,10 @@ export default {
     const init = async () => {
       data.loginInloading = true;
       const token = new AuthenticationToken(
-        data.formData.account,
+        route.query.Token,
         data.formData.password
       );
+      console.log("AuthenticationToken", AuthenticationToken);
       await store.dispatch('subject/login', token);
       handleLogin();
       data.loginInloading = false;