diff --git a/src/router/index.js b/src/router/index.js
index c787664..3304bfc 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -251,7 +251,35 @@ export const dynamicRoutes = [
         meta: { title: 'loading', activeMenu: '/form/drug' }
       }
     ]
-  }
+  },
+   {
+    path: '/resource/mjy',
+    component: Layout,
+    hidden: true,
+    permissions: ['business:resource:mjy:list'],
+    children: [
+      {
+        path: ':tab',
+        component: () => import('@/views/business/resource/mjy/index'),
+        name: 'Mjy',
+        meta: { title: 'loading', activeMenu: '/resource/mjy/mjyList' }
+      }
+    ]
+  },
+   {
+    path: '/resource/gyzj',
+    component: Layout,
+    hidden: true,
+    permissions: ['business:resource:gyzj:list'],
+    children: [
+      {
+        path: ':tab',
+        component: () => import('@/views/business/resource/gyzj/index'),
+        name: 'Gyzj',
+        meta: { title: 'loading', activeMenu: '/resource/gyzj/gyzjList' }
+      }
+    ]
+  },
 ]
 
 // 防止连续点击多次路由报错
diff --git a/src/views/business/resource/gyzj/comps/ffjlList.vue b/src/views/business/resource/gyzj/comps/ffjlList.vue
index 25aca52..892648b 100644
--- a/src/views/business/resource/gyzj/comps/ffjlList.vue
+++ b/src/views/business/resource/gyzj/comps/ffjlList.vue
@@ -8,23 +8,19 @@
             <el-col :span="24">
               <!-- 名称 -->
               <el-form-item :label="$t('page.business.resource.gyzj.mc') + '：'">
-                <el-input v-model="queryParams.mc" clearable 
-                  :placeholder="$t('form.placeholderInput')" />
+                <el-input v-model="queryParams.mc" clearable :placeholder="$t('form.placeholderInput')" />
               </el-form-item>
               <!-- 编号 -->
               <el-form-item :label="$t('page.business.resource.gyzj.bh') + '：'">
-                <el-input v-model="queryParams.bh" clearable 
-                  :placeholder="$t('form.placeholderInput')" />
+                <el-input v-model="queryParams.bh" clearable :placeholder="$t('form.placeholderInput')" />
               </el-form-item>
               <!-- 目的 -->
               <el-form-item :label="$t('page.business.resource.gyzj.md') + '：'">
-                <el-input v-model="queryParams.mdMc" clearable 
-                  :placeholder="$t('form.placeholderInput')" />
+                <el-input v-model="queryParams.mdMc" clearable :placeholder="$t('form.placeholderInput')" />
               </el-form-item>
               <!-- 记录状态 -->
               <el-form-item :label="$t('page.business.resource.gyzj.jlzt') + '：'">
-                <el-select v-model="queryParams.jlzt" :placeholder="$t('form.placeholderSelect')" clearable
-                  >
+                <el-select v-model="queryParams.jlzt" :placeholder="$t('form.placeholderSelect')" clearable>
                   <el-option :label="$t('page.business.resource.resource.jlzt.wsd')" :value="1" />
                   <el-option :label="$t('page.business.resource.resource.jlzt.ysd')" :value="3" />
                   <el-option :label="$t('page.business.resource.resource.jlzt.dgd')" :value="5" />
@@ -33,7 +29,8 @@
                 </el-select>
               </el-form-item>
               <!-- 借阅状态 -->
-              <el-form-item :label="$t('page.business.resource.gyzj.jyzt') + '：'" :label-width="$i18n.locale === 'zh_CN'?'88px':'150px'">
+              <el-form-item :label="$t('page.business.resource.gyzj.jyzt') + '：'"
+                :label-width="$i18n.locale === 'zh_CN' ? '88px' : '150px'">
                 <el-select v-model="queryParams.jyzt" :placeholder="$t('form.placeholderSelect')" clearable>
                   <el-option :label="$t('page.business.resource.resource.jyzt.wjy')" :value="1" />
                   <el-option :label="$t('page.business.resource.resource.jyzt.djy')" :value="3" />
@@ -49,13 +46,15 @@
           <el-row>
             <el-col :span="24">
               <!-- 出库日期 -->
-              <el-form-item :label="$t('page.business.resource.gyzj.cksj') + '：'" :label-width="$i18n.locale === 'zh_CN'?'88px':'180px'">
+              <el-form-item :label="$t('page.business.resource.gyzj.cksj') + '：'"
+                :label-width="$i18n.locale === 'zh_CN' ? '88px' : '180px'">
                 <el-date-picker v-model="daterangeCk" class="chat-histogram-daterange" type="daterange"
                   range-separator="-" :start-placeholder="$t('form.startDate')" :end-placeholder="$t('form.endDate')"
                   value-format="yyyy-MM-dd" @change="handleQuery" style="width: 250px;" />
               </el-form-item>
               <!-- 入库日期 -->
-              <el-form-item :label="$t('page.business.resource.gyzj.rksj') + '：'" :label-width="$i18n.locale === 'zh_CN'?'88px':'180px'">
+              <el-form-item :label="$t('page.business.resource.gyzj.rksj') + '：'"
+                :label-width="$i18n.locale === 'zh_CN' ? '88px' : '180px'">
                 <el-date-picker v-model="daterangeRk" class="chat-histogram-daterange" type="daterange"
                   range-separator="-" :start-placeholder="$t('form.startDate')" :end-placeholder="$t('form.endDate')"
                   value-format="yyyy-MM-dd" @change="handleQuery" style="width: 250px;" />
@@ -78,9 +77,8 @@
           </el-col>
           <el-col :span="1.5">
             <!-- 导出 -->
-            <el-button type="primary"  @click="exportExcel"
-              v-hasPermi="['business:resource:gyzj:ffjldc']">{{
-                $t('form.export') }}</el-button>
+            <el-button type="primary" @click="exportExcel" v-hasPermi="['business:resource:gyzj:ffjldc']">{{
+              $t('form.export') }}</el-button>
           </el-col>
         </el-row>
 
@@ -90,56 +88,71 @@
             :show-overflow-tooltip="true" />
           <el-table-column :label="$t('page.business.resource.gyzj.mc')" align="left" prop="mc"
             :show-overflow-tooltip="true" />
-         
-          <el-table-column :label="$t('page.business.resource.gyzj.md')" align="center" width="100px"  :show-overflow-tooltip="true" >
+
+          <el-table-column :label="$t('page.business.resource.gyzj.md')" align="center" width="100px"
+            :show-overflow-tooltip="true">
             <template slot-scope="scope">
-              <span v-if="scope.row.mdOther && scope.row.mdOther != ''&&scope.row.mdMcs && scope.row.mdMcs != ''">{{ scope.row.mdMcs }},{{ scope.row.mdOther }}</span>
+              <span v-if="scope.row.mdOther && scope.row.mdOther != '' && scope.row.mdMcs && scope.row.mdMcs != ''">{{
+                scope.row.mdMcs }},{{ scope.row.mdOther }}</span>
               <span v-else>{{ scope.row.mdMcs }}{{ scope.row.mdOther }}</span>
             </template>
           </el-table-column>
-          <el-table-column :label="$t('page.business.resource.gyzj.zytj')" align="center" prop="ffzytj" :width="$i18n.locale === 'zh_CN'?'100px':'180px'"/>
+          <el-table-column :label="$t('page.business.resource.gyzj.zytj')" align="center" prop="ffzytj"
+            :width="$i18n.locale === 'zh_CN' ? '100px' : '180px'" />
           <el-table-column :label="$t('page.business.resource.gyzj.cksj')" align="center" prop="ffrq" width="150px" />
           <el-table-column :label="$t('page.business.resource.gyzj.rksj')" align="center" prop="ghrq" width="150px" />
-          <el-table-column :label="$t('page.business.resource.gyzj.ckl')" align="center" :width="$i18n.locale === 'zh_CN'?'100px':'180px'">
+          <el-table-column :label="$t('page.business.resource.gyzj.ckl')" align="center"
+            :width="$i18n.locale === 'zh_CN' ? '100px' : '180px'">
             <template slot-scope="scope">
               {{ scope.row.ckl }} {{ scope.row.ckldw }}
             </template>
           </el-table-column>
-          <el-table-column :label="$t('page.business.resource.gyzj.rkl')" align="center" :width="$i18n.locale === 'zh_CN'?'100px':'180px'">
+          <el-table-column :label="$t('page.business.resource.gyzj.rkl')" align="center"
+            :width="$i18n.locale === 'zh_CN' ? '100px' : '180px'">
             <template slot-scope="scope">
               {{ scope.row.rkl }} {{ scope.row.rkldw }}
             </template>
           </el-table-column>
-          <el-table-column :label="$t('page.business.resource.gyzj.syl')" align="center" :width="$i18n.locale === 'zh_CN'?'80px':'120px'">
+          <el-table-column :label="$t('page.business.resource.gyzj.syl')" align="center"
+            :width="$i18n.locale === 'zh_CN' ? '80px' : '120px'">
             <template slot-scope="scope">
               {{ scope.row.syl }} {{ scope.row.syldw }}
             </template>
           </el-table-column>
-           <el-table-column :label="$t('page.business.resource.gyzj.kgy1')" align="center" prop="jsr1Mc" :width="$i18n.locale === 'zh_CN'?'80px':'180px'"
-            :show-overflow-tooltip="true" />
-          <el-table-column :label="$t('page.business.resource.gyzj.kgy2')" align="center" prop="jsr2Mc" :width="$i18n.locale === 'zh_CN'?'80px':'180px'"
-            :show-overflow-tooltip="true" />
-          <el-table-column :label="$t('page.business.resource.gyzj.lqr1')" align="center" prop="lqr1Mc" :width="$i18n.locale === 'zh_CN'?'80px':'100px'"
-            :show-overflow-tooltip="true" />
-          <el-table-column :label="$t('page.business.resource.gyzj.lqr2')" align="center" prop="lqr2Mc" :width="$i18n.locale === 'zh_CN'?'80px':'100px'"
-            :show-overflow-tooltip="true" />
-         
+          <el-table-column :label="$t('page.business.resource.gyzj.kgy1')" align="center" prop="jsr1Mc"
+            :width="$i18n.locale === 'zh_CN' ? '80px' : '180px'" :show-overflow-tooltip="true" />
+          <el-table-column :label="$t('page.business.resource.gyzj.kgy2')" align="center" prop="jsr2Mc"
+            :width="$i18n.locale === 'zh_CN' ? '80px' : '180px'" :show-overflow-tooltip="true" />
+          <el-table-column :label="$t('page.business.resource.gyzj.lqr1')" align="center" prop="lqr1Mc"
+            :width="$i18n.locale === 'zh_CN' ? '80px' : '100px'" :show-overflow-tooltip="true" />
+          <el-table-column :label="$t('page.business.resource.gyzj.lqr2')" align="center" prop="lqr2Mc"
+            :width="$i18n.locale === 'zh_CN' ? '80px' : '100px'" :show-overflow-tooltip="true" />
+
           <el-table-column :label="$t('page.business.resource.gyzj.zcg')" align="center" prop="zcgMc"
             :show-overflow-tooltip="true" />
           <el-table-column :label="$t('page.business.resource.gyzj.jlzt')" align="center" width="100px" fixed="right">
             <template slot-scope="scope">
-              <span v-if="scope.row.jlzt == 1"><span class="status-circle wsd"></span>{{ $t('page.business.resource.resource.jlzt.wsd') }}</span>
-              <span v-if="scope.row.jlzt == 3"><span class="status-circle ysd"></span>{{ $t('page.business.resource.resource.jlzt.ysd') }}</span>
-              <span v-if="scope.row.jlzt == 5"><span class="status-circle dgd"></span>{{ $t('page.business.resource.resource.jlzt.dgd') }}</span>
-              <span v-if="scope.row.jlzt == 7"><span class="status-circle gd"></span>{{ $t('page.business.resource.resource.jlzt.gd') }}</span>
-              <span v-if="scope.row.jlzt == 9"><span class="status-circle djd"></span>{{ $t('page.business.resource.resource.jlzt.djd') }}</span>
+              <span v-if="scope.row.jlzt == 1"><span class="status-circle wsd"></span>{{
+                $t('page.business.resource.resource.jlzt.wsd') }}</span>
+              <span v-if="scope.row.jlzt == 3"><span class="status-circle ysd"></span>{{
+                $t('page.business.resource.resource.jlzt.ysd') }}</span>
+              <span v-if="scope.row.jlzt == 5"><span class="status-circle dgd"></span>{{
+                $t('page.business.resource.resource.jlzt.dgd') }}</span>
+              <span v-if="scope.row.jlzt == 7"><span class="status-circle gd"></span>{{
+                $t('page.business.resource.resource.jlzt.gd') }}</span>
+              <span v-if="scope.row.jlzt == 9"><span class="status-circle djd"></span>{{
+                $t('page.business.resource.resource.jlzt.djd') }}</span>
             </template>
           </el-table-column>
-          <el-table-column :label="$t('page.business.resource.gyzj.jyzt')" align="center" fixed="right" :width="$i18n.locale === 'zh_CN'?'100px':'180px'">
+          <el-table-column :label="$t('page.business.resource.gyzj.jyzt')" align="center" fixed="right"
+            :width="$i18n.locale === 'zh_CN' ? '100px' : '180px'">
             <template slot-scope="scope">
-              <span v-if="scope.row.jyzt == 1"><span class="status-circle wjy"></span>{{ $t('page.business.resource.resource.jyzt.wjy') }}</span>
-              <span v-if="scope.row.jyzt == 3"><span class="status-circle djy"></span>{{ $t('page.business.resource.resource.jyzt.djy') }}</span>
-              <span v-if="scope.row.jyzt == 5"><span class="status-circle jyz"></span>{{ $t('page.business.resource.resource.jyzt.jyz') }}</span>
+              <span v-if="scope.row.jyzt == 1"><span class="status-circle wjy"></span>{{
+                $t('page.business.resource.resource.jyzt.wjy') }}</span>
+              <span v-if="scope.row.jyzt == 3"><span class="status-circle djy"></span>{{
+                $t('page.business.resource.resource.jyzt.djy') }}</span>
+              <span v-if="scope.row.jyzt == 5"><span class="status-circle jyz"></span>{{
+                $t('page.business.resource.resource.jyzt.jyz') }}</span>
             </template>
           </el-table-column>
           <el-table-column :label="$t('form.operate')" fixed="right" align="center"
@@ -165,14 +178,14 @@
               <el-button type="text" v-if="scope.row.jlzt == 3" @click="handleGd(scope.row)"
                 v-hasPermi="['business:resource:gyzj:ffjlgd']">{{
                   $t('page.business.resource.gyzj.guidang') }}</el-button>
-              <!-- 解档 -->
-              <el-button type="text" v-if="scope.row.jlzt == 7 && scope.row.jyzt == 1" @click="handleJd(scope.row)"
-                v-hasPermi="['business:resource:gyzj:ffjljd']">{{
+              <template v-if="scope.row.jlzt == 7 && scope.row.jyzt == 1 && id == scope.row.gdsqrId">
+                <!-- 解档 -->
+                <el-button type="text" @click="handleJd(scope.row)" v-hasPermi="['business:resource:gyzj:ffjljd']">{{
                   $t('page.business.resource.gyzj.jiedang') }}</el-button>
-              <!-- 借阅 -->
-              <el-button type="text" v-if="scope.row.jlzt == 7 && scope.row.jyzt == 1" @click="handleJy(scope.row)"
-                v-hasPermi="['business:resource:gyzj:ffjljy']">{{
+                <!-- 借阅 -->
+                <el-button type="text" @click="handleJy(scope.row)" v-hasPermi="['business:resource:gyzj:ffjljy']">{{
                   $t('page.business.resource.gyzj.jieyue') }}</el-button>
+              </template>
             </template>
           </el-table-column>
         </el-table>
@@ -208,6 +221,7 @@ import Xq from "./ffjl/Xq";
 import Jq from "./ffjl/Jq";
 import moment from "moment";
 import { deepClone } from "@/utils/index";
+import { mapGetters } from 'vuex'
 
 export default {
   name: "FfjlList",
@@ -240,6 +254,11 @@ export default {
       },
     }
   },
+  computed: {
+    ...mapGetters([
+      'id'
+    ]),
+  },
   created() {
     this.getList()
   },
@@ -311,10 +330,10 @@ export default {
             value.mc +
             '</td>' +
             ' <td>' +
-            '&nbsp;'+value.bh +
+            '&nbsp;' + value.bh +
             '</td>' +
             ' <td>' +
-            (value.mdMcs&&value.mdMcs!=''&&value.mdOther&&value.mdOther!=''? (value.mdMcs +","+value.mdOther) :(value.mdMcs +value.mdOther))+
+            (value.mdMcs && value.mdMcs != '' && value.mdOther && value.mdOther != '' ? (value.mdMcs + "," + value.mdOther) : (value.mdMcs + value.mdOther)) +
             '</td>' +
             ' <td>' +
             value.ffzytj +
@@ -326,13 +345,13 @@ export default {
             value.ghrq +
             '</td>' +
             ' <td>' +
-            value.ckl +value.ckldw+
+            value.ckl + value.ckldw +
             '</td>' +
             ' <td>' +
-            value.rkl+value.rkldw +
+            value.rkl + value.rkldw +
             '</td>' +
             ' <td>' +
-            value.syl+value.syldw +
+            value.syl + value.syldw +
             '</td>' +
             ' <td>' +
             value.lqr1Mc +
diff --git a/src/views/business/resource/gyzj/comps/gyzjList.vue b/src/views/business/resource/gyzj/comps/gyzjList.vue
index 736692c..ad1875d 100644
--- a/src/views/business/resource/gyzj/comps/gyzjList.vue
+++ b/src/views/business/resource/gyzj/comps/gyzjList.vue
@@ -189,12 +189,12 @@
                 <el-button type="text" @click="handleRk(scope.row)" v-hasPermi="['business:resource:gyzj:rk']">{{
                   $t('page.business.resource.gyzj.qrrk') }}</el-button>
               </template>
-              <template v-if="scope.row.zjzt == 9&&scope.row.jyzt == 1">
+              <template v-if="scope.row.zjzt == 9&&scope.row.jyzt == 1&& id == scope.row.gdsqrId">
                 <!-- 解档 -->
                 <el-button type="text" @click="handleJd(scope.row)" v-hasPermi="['business:resource:gyzj:jd']">{{
                   $t('page.business.resource.gyzj.jiedang') }}</el-button>
                 <!-- 借阅 -->
-                <el-button type="text" v-if="scope.row.jyzt == 1" @click="handleJy(scope.row)" v-hasPermi="['business:resource:gyzj:jy']">{{
+                <el-button type="text"  @click="handleJy(scope.row)" v-hasPermi="['business:resource:gyzj:jy']">{{
                   $t('page.business.resource.gyzj.jieyue') }}</el-button>
               </template>
             </template>
@@ -260,6 +260,7 @@ import Czyj from "./gyzj/Czyj";
 import Ysff from "./gyzj/Ysff";
 import moment from "moment";
 import { deepClone } from "@/utils/index";
+import { mapGetters } from 'vuex'
 
 export default {
   name: "GyzjList",
@@ -288,6 +289,11 @@ export default {
       },
     }
   },
+  computed: {
+    ...mapGetters([
+      'id'
+    ]),
+  },
   created() {
     this.getList()
   },
diff --git a/src/views/business/resource/gyzj/index.vue b/src/views/business/resource/gyzj/index.vue
index 2e62448..911db44 100644
--- a/src/views/business/resource/gyzj/index.vue
+++ b/src/views/business/resource/gyzj/index.vue
@@ -29,10 +29,13 @@ export default {
         { key: 'gyzjList', name: 'page.business.resource.gyzj.gyzjgl' },
         { key: 'ffjlList', name: 'page.business.resource.gyzj.ffhsjl' },
       ],
-      active: 'gyzjList',
+      active: this.$route.params.tab||'gyzjList',
     }
   },
-  created() { },
+  created() { 
+     const obj = Object.assign({}, this.$route, { title:this.$t('page.business.resource.gyzj.gyzjgl')}) 
+     this.$tab.updatePage(obj);
+  },
   methods: {
     show(row) {
       this.study = row
diff --git a/src/views/business/resource/mjy/comps/ffjlList.vue b/src/views/business/resource/mjy/comps/ffjlList.vue
index c4ca798..39af500 100644
--- a/src/views/business/resource/mjy/comps/ffjlList.vue
+++ b/src/views/business/resource/mjy/comps/ffjlList.vue
@@ -8,18 +8,15 @@
             <el-col :span="24">
               <!-- 名称 -->
               <el-form-item :label="$t('page.business.resource.mjy.mc') + '：'">
-                <el-input v-model="queryParams.mc" clearable 
-                  :placeholder="$t('form.placeholderInput')" />
+                <el-input v-model="queryParams.mc" clearable :placeholder="$t('form.placeholderInput')" />
               </el-form-item>
               <!-- 编号 -->
               <el-form-item :label="$t('page.business.resource.mjy.bh') + '：'">
-                <el-input v-model="queryParams.bh" clearable
-                  :placeholder="$t('form.placeholderInput')" />
+                <el-input v-model="queryParams.bh" clearable :placeholder="$t('form.placeholderInput')" />
               </el-form-item>
               <!-- 目的 -->
               <el-form-item :label="$t('page.business.resource.mjy.md') + '：'">
-                <el-input v-model="queryParams.mdMc" clearable
-                  :placeholder="$t('form.placeholderInput')" />
+                <el-input v-model="queryParams.mdMc" clearable :placeholder="$t('form.placeholderInput')" />
               </el-form-item>
               <!-- 记录状态 -->
               <el-form-item :label="$t('page.business.resource.mjy.jlzt') + '：'">
@@ -32,7 +29,8 @@
                 </el-select>
               </el-form-item>
               <!-- 借阅状态 -->
-              <el-form-item :label="$t('page.business.resource.mjy.jyzt') + '：'"  :label-width="$i18n.locale === 'zh_CN'?'88px':'150px'">
+              <el-form-item :label="$t('page.business.resource.mjy.jyzt') + '：'"
+                :label-width="$i18n.locale === 'zh_CN' ? '88px' : '150px'">
                 <el-select v-model="queryParams.jyzt" :placeholder="$t('form.placeholderSelect')" clearable>
                   <el-option :label="$t('page.business.resource.resource.jyzt.wjy')" :value="1" />
                   <el-option :label="$t('page.business.resource.resource.jyzt.djy')" :value="3" />
@@ -48,13 +46,15 @@
           <el-row>
             <el-col :span="24">
               <!-- 出库日期 -->
-              <el-form-item :label="$t('page.business.resource.mjy.cksj') + '：'" :label-width="$i18n.locale === 'zh_CN'?'88px':'180px'">
+              <el-form-item :label="$t('page.business.resource.mjy.cksj') + '：'"
+                :label-width="$i18n.locale === 'zh_CN' ? '88px' : '180px'">
                 <el-date-picker v-model="daterangeCk" class="chat-histogram-daterange" type="daterange"
                   range-separator="-" :start-placeholder="$t('form.startDate')" :end-placeholder="$t('form.endDate')"
                   value-format="yyyy-MM-dd" @change="handleQuery" style="width: 250px;" />
               </el-form-item>
               <!-- 入库日期 -->
-              <el-form-item :label="$t('page.business.resource.mjy.rksj') + '：'" :label-width="$i18n.locale === 'zh_CN'?'88px':'180px'">
+              <el-form-item :label="$t('page.business.resource.mjy.rksj') + '：'"
+                :label-width="$i18n.locale === 'zh_CN' ? '88px' : '180px'">
                 <el-date-picker v-model="daterangeRk" class="chat-histogram-daterange" type="daterange"
                   range-separator="-" :start-placeholder="$t('form.startDate')" :end-placeholder="$t('form.endDate')"
                   value-format="yyyy-MM-dd" @change="handleQuery" style="width: 250px;" />
@@ -77,75 +77,88 @@
           </el-col>
           <el-col :span="1.5">
             <!-- 导出 -->
-            <el-button type="primary"  @click="exportExcel"
-              v-hasPermi="['business:resource:mjy:ffjldc']">{{
-                $t('form.export') }}</el-button>
+            <el-button type="primary" @click="exportExcel" v-hasPermi="['business:resource:mjy:ffjldc']">{{
+              $t('form.export') }}</el-button>
           </el-col>
         </el-row>
 
         <el-table v-loading="loading" :data="list" @selection-change="handleSelectionChange">
-          <el-table-column type="selection" fixed="left"   width="55" align="center" :selectable="checkSelectable" />
+          <el-table-column type="selection" fixed="left" width="55" align="center" :selectable="checkSelectable" />
           <el-table-column :label="$t('page.business.resource.mjy.mc')" align="left" prop="mc"
             :show-overflow-tooltip="true" />
           <el-table-column :label="$t('page.business.resource.mjy.bh')" align="center" prop="bh"
             :show-overflow-tooltip="true" />
-           <el-table-column :label="$t('page.business.resource.gyzj.md')" align="center" width="100px"  :show-overflow-tooltip="true" >
+          <el-table-column :label="$t('page.business.resource.gyzj.md')" align="center" width="100px"
+            :show-overflow-tooltip="true">
             <template slot-scope="scope">
-              <span v-if="scope.row.mdOther && scope.row.mdOther != ''&&scope.row.mdMcs && scope.row.mdMcs != ''">{{ scope.row.mdMcs }},{{ scope.row.mdOther }}</span>
+              <span v-if="scope.row.mdOther && scope.row.mdOther != '' && scope.row.mdMcs && scope.row.mdMcs != ''">{{
+                scope.row.mdMcs }},{{ scope.row.mdOther }}</span>
               <span v-else>{{ scope.row.mdMcs }}{{ scope.row.mdOther }}</span>
             </template>
           </el-table-column>
           <el-table-column :label="$t('page.business.resource.mjy.zytj')" align="center" prop="ffzytj"
-             :width="$i18n.locale === 'zh_CN'?'100px':'180px'"/>
+            :width="$i18n.locale === 'zh_CN' ? '100px' : '180px'" />
           <el-table-column :label="$t('page.business.resource.mjy.cksj')" align="center" prop="ffrq" width="150px" />
           <el-table-column :label="$t('page.business.resource.mjy.rksj')" align="center" prop="ghrq" width="150px" />
-          <el-table-column :label="$t('page.business.resource.mjy.ckmz')" align="center"  :width="$i18n.locale === 'zh_CN'?'100px':'180px'">
+          <el-table-column :label="$t('page.business.resource.mjy.ckmz')" align="center"
+            :width="$i18n.locale === 'zh_CN' ? '100px' : '180px'">
             <template slot-scope="scope">
               {{ scope.row.ckmz }} {{ scope.row.ckmzdw }}
             </template>
           </el-table-column>
-          <el-table-column :label="$t('page.business.resource.mjy.rkmz')" align="center"  :width="$i18n.locale === 'zh_CN'?'100px':'180px'">
+          <el-table-column :label="$t('page.business.resource.mjy.rkmz')" align="center"
+            :width="$i18n.locale === 'zh_CN' ? '100px' : '180px'">
             <template slot-scope="scope">
               {{ scope.row.rkmz }} {{ scope.row.rkmzdw }}
             </template>
           </el-table-column>
-          <el-table-column :label="$t('page.business.resource.mjy.syl')" align="center" :width="$i18n.locale === 'zh_CN'?'80px':'120px'">
+          <el-table-column :label="$t('page.business.resource.mjy.syl')" align="center"
+            :width="$i18n.locale === 'zh_CN' ? '80px' : '120px'">
             <template slot-scope="scope">
               {{ scope.row.syl }} {{ scope.row.syldw }}
             </template>
           </el-table-column>
-          <el-table-column :label="$t('page.business.resource.mjy.lqr1')" align="center" prop="lqr1Mc" :width="$i18n.locale === 'zh_CN'?'80px':'100px'"
-            :show-overflow-tooltip="true" />
-          <el-table-column :label="$t('page.business.resource.mjy.lqr2')" align="center" prop="lqr2Mc" :width="$i18n.locale === 'zh_CN'?'80px':'100px'"
-            :show-overflow-tooltip="true" />
-          <el-table-column :label="$t('page.business.resource.mjy.kgy1')" align="center" prop="jsr1Mc" :width="$i18n.locale === 'zh_CN'?'100px':'180px'"
-            :show-overflow-tooltip="true" />
-          <el-table-column :label="$t('page.business.resource.mjy.kgy2')" align="center" prop="jsr2Mc" :width="$i18n.locale === 'zh_CN'?'100px':'180px'"
-            :show-overflow-tooltip="true" />
+          <el-table-column :label="$t('page.business.resource.mjy.lqr1')" align="center" prop="lqr1Mc"
+            :width="$i18n.locale === 'zh_CN' ? '80px' : '100px'" :show-overflow-tooltip="true" />
+          <el-table-column :label="$t('page.business.resource.mjy.lqr2')" align="center" prop="lqr2Mc"
+            :width="$i18n.locale === 'zh_CN' ? '80px' : '100px'" :show-overflow-tooltip="true" />
+          <el-table-column :label="$t('page.business.resource.mjy.kgy1')" align="center" prop="jsr1Mc"
+            :width="$i18n.locale === 'zh_CN' ? '100px' : '180px'" :show-overflow-tooltip="true" />
+          <el-table-column :label="$t('page.business.resource.mjy.kgy2')" align="center" prop="jsr2Mc"
+            :width="$i18n.locale === 'zh_CN' ? '100px' : '180px'" :show-overflow-tooltip="true" />
           <el-table-column :label="$t('page.business.resource.mjy.zcg')" align="center" prop="zcgMc"
             :show-overflow-tooltip="true" />
           <el-table-column :label="$t('page.business.resource.mjy.jlzt')" align="center" width="100px" fixed="right">
             <template slot-scope="scope">
-              <span v-if="scope.row.jlzt == 1"><span class="status-circle wsd"></span>{{ $t('page.business.resource.resource.jlzt.wsd') }}</span>
-              <span v-if="scope.row.jlzt == 3"><span class="status-circle ysd"></span>{{ $t('page.business.resource.resource.jlzt.ysd') }}</span>
-              <span v-if="scope.row.jlzt == 5"><span class="status-circle dgd"></span>{{ $t('page.business.resource.resource.jlzt.dgd') }}</span>
-              <span v-if="scope.row.jlzt == 7"><span class="status-circle gd"></span>{{ $t('page.business.resource.resource.jlzt.gd') }}</span>
-              <span v-if="scope.row.jlzt == 9"><span class="status-circle djd"></span>{{ $t('page.business.resource.resource.jlzt.djd') }}</span>
+              <span v-if="scope.row.jlzt == 1"><span class="status-circle wsd"></span>{{
+                $t('page.business.resource.resource.jlzt.wsd') }}</span>
+              <span v-if="scope.row.jlzt == 3"><span class="status-circle ysd"></span>{{
+                $t('page.business.resource.resource.jlzt.ysd') }}</span>
+              <span v-if="scope.row.jlzt == 5"><span class="status-circle dgd"></span>{{
+                $t('page.business.resource.resource.jlzt.dgd') }}</span>
+              <span v-if="scope.row.jlzt == 7"><span class="status-circle gd"></span>{{
+                $t('page.business.resource.resource.jlzt.gd') }}</span>
+              <span v-if="scope.row.jlzt == 9"><span class="status-circle djd"></span>{{
+                $t('page.business.resource.resource.jlzt.djd') }}</span>
             </template>
           </el-table-column>
-          <el-table-column :label="$t('page.business.resource.mjy.jyzt')" align="center" fixed="right"  :width="$i18n.locale === 'zh_CN'?'100px':'180px'">
+          <el-table-column :label="$t('page.business.resource.mjy.jyzt')" align="center" fixed="right"
+            :width="$i18n.locale === 'zh_CN' ? '100px' : '180px'">
             <template slot-scope="scope">
-              <span v-if="scope.row.jyzt == 1"><span class="status-circle wjy"></span>{{ $t('page.business.resource.resource.jyzt.wjy') }}</span>
-              <span v-if="scope.row.jyzt == 3"><span class="status-circle ysd"></span>{{ $t('page.business.resource.resource.jyzt.djy') }}</span>
-              <span v-if="scope.row.jyzt == 5"><span class="status-circle syz"></span>{{ $t('page.business.resource.resource.jyzt.jyz') }}</span>
+              <span v-if="scope.row.jyzt == 1"><span class="status-circle wjy"></span>{{
+                $t('page.business.resource.resource.jyzt.wjy') }}</span>
+              <span v-if="scope.row.jyzt == 3"><span class="status-circle ysd"></span>{{
+                $t('page.business.resource.resource.jyzt.djy') }}</span>
+              <span v-if="scope.row.jyzt == 5"><span class="status-circle syz"></span>{{
+                $t('page.business.resource.resource.jyzt.jyz') }}</span>
             </template>
           </el-table-column>
           <el-table-column :label="$t('form.operate')" fixed="right" align="center"
             class-name="small-padding fixed-width" width="250px">
             <template slot-scope="scope">
-               <!-- 加签 -->
-              <el-button v-if="scope.row.jlzt == 1 " type="text"
-                @click="handleJq(scope.row)" v-hasPermi="['business:resource:mjy:ffjljq']">{{
+              <!-- 加签 -->
+              <el-button v-if="scope.row.jlzt == 1" type="text" @click="handleJq(scope.row)"
+                v-hasPermi="['business:resource:mjy:ffjljq']">{{
                   $t('page.business.resource.mjy.jiaqian') }}</el-button>
               <!-- 详情 -->
               <el-button v-if="scope.row.jlzt == 1 || scope.row.jlzt == 3 || scope.row.jyzt == 5" type="text"
@@ -163,14 +176,16 @@
               <el-button type="text" v-if="scope.row.jlzt == 3" @click="handleGd(scope.row)"
                 v-hasPermi="['business:resource:mjy:ffjlgd']">{{
                   $t('page.business.resource.mjy.guidang') }}</el-button>
-              <!-- 解档 -->
-              <el-button type="text" v-if="scope.row.jlzt == 7&&scope.row.jyzt == 1" @click="handleJd(scope.row)"
-                v-hasPermi="['business:resource:mjy:ffjljd']">{{
-                  $t('page.business.resource.mjy.jiedang') }}</el-button>
-              <!-- 借阅 -->
-              <el-button type="text" v-if="scope.row.jlzt == 7&&scope.row.jyzt == 1" @click="handleJy(scope.row)"
-                v-hasPermi="['business:resource:mjy:ffjljy']">{{
-                  $t('page.business.resource.mjy.jieyue') }}</el-button>
+              <template v-if="scope.row.jlzt == 7 && scope.row.jyzt == 1 && id == scope.row.gdsqrId">
+                <!-- 解档 -->
+                <el-button type="text" 
+                  v-hasPermi="['business:resource:mjy:ffjljd']">{{
+                    $t('page.business.resource.mjy.jiedang') }}</el-button>
+                <!-- 借阅 -->
+                <el-button type="text" @click="handleJy(scope.row)"
+                  v-hasPermi="['business:resource:mjy:ffjljy']">{{
+                    $t('page.business.resource.mjy.jieyue') }}</el-button>
+              </template>
             </template>
           </el-table-column>
         </el-table>
@@ -188,7 +203,7 @@
       <!-- 借阅 -->
       <Jy key="Jy" ref="Jy" @callback="handleQuery" />
       <!-- 详情 -->
-      <Xq key="Xq" v-show="showDetail" ref="Xq" @callback="closeXq"/>
+      <Xq key="Xq" v-show="showDetail" ref="Xq" @callback="closeXq" />
       <!-- 加签 -->
       <Jq key="Jq" ref="Jq" @callback="handleQuery" />
     </div>
@@ -206,6 +221,7 @@ import Xq from "./ffjl/Xq";
 import Jq from "./ffjl/Jq";
 import moment from "moment";
 import { deepClone } from "@/utils/index";
+import { mapGetters } from 'vuex'
 
 export default {
   name: "FfjlList",
@@ -215,7 +231,7 @@ export default {
       daterangeCk: [],
       daterangeRk: [],
       loading: true,
-      showDetail:false,
+      showDetail: false,
       single: true,
       multiple: true,
       total: 0,
@@ -241,6 +257,11 @@ export default {
   created() {
     this.getList()
   },
+  computed: {
+    ...mapGetters([
+      'id'
+    ]),
+  },
   methods: {
     exportExcel() {
       let that = this
@@ -309,10 +330,10 @@ export default {
             value.mc +
             '</td>' +
             ' <td>' +
-            '&nbsp;'+value.bh +
+            '&nbsp;' + value.bh +
             '</td>' +
             ' <td>' +
-            (value.mdMcs&&value.mdMcs!=''&&value.mdOther&&value.mdOther!=''? (value.mdMcs +","+value.mdOther) :(value.mdMcs +value.mdOther))+
+            (value.mdMcs && value.mdMcs != '' && value.mdOther && value.mdOther != '' ? (value.mdMcs + "," + value.mdOther) : (value.mdMcs + value.mdOther)) +
             '</td>' +
             ' <td>' +
             value.ffzytj +
@@ -324,13 +345,13 @@ export default {
             value.ghrq +
             '</td>' +
             ' <td>' +
-            value.ckmz +value.ckmzdw+
+            value.ckmz + value.ckmzdw +
             '</td>' +
             ' <td>' +
-            value.rkmz+value.rkmzdw +
+            value.rkmz + value.rkmzdw +
             '</td>' +
             ' <td>' +
-            value.syl+value.syldw +
+            value.syl + value.syldw +
             '</td>' +
             ' <td>' +
             value.lqr1Mc +
@@ -400,15 +421,15 @@ export default {
     handlePlsd() {
       this.$refs.Sd.showBatch(this.selectList)
     },
-      closeXq(){
-      this.showDetail=false
-      this.$emit('showDetail',this.showDetail)
+    closeXq() {
+      this.showDetail = false
+      this.$emit('showDetail', this.showDetail)
       this.handleQuery()
     },
     //详情
     handleXq(row) {
-      this.showDetail=true
-      this.$emit('showDetail',this.showDetail)
+      this.showDetail = true
+      this.$emit('showDetail', this.showDetail)
       this.$refs.Xq.show(row)
     },
     //归档
diff --git a/src/views/business/resource/mjy/comps/mjyList.vue b/src/views/business/resource/mjy/comps/mjyList.vue
index acd6968..84e3a24 100644
--- a/src/views/business/resource/mjy/comps/mjyList.vue
+++ b/src/views/business/resource/mjy/comps/mjyList.vue
@@ -188,7 +188,7 @@
                 <el-button type="text" @click="handleRk(scope.row)" v-hasPermi="['business:resource:mjy:rk']">{{
                   $t('page.business.resource.mjy.ruku') }}</el-button>
               </template>
-              <template v-if="scope.row.zjzt == 9&&scope.row.jyzt == 1">
+              <template v-if="scope.row.zjzt == 9&&scope.row.jyzt == 1&&id==scope.row.gdsqrId">
                 <!-- 解档 -->
                 <el-button type="text" @click="handleJd(scope.row)" v-hasPermi="['business:resource:mjy:jd']">{{
                   $t('page.business.resource.mjy.jiedang') }}</el-button>
@@ -259,6 +259,7 @@ import Czyj from "./mjy/Czyj";
 import Ysff from "./mjy/Ysff";
 import moment from "moment";
 import { deepClone } from "@/utils/index";
+import { mapGetters } from 'vuex'
 
 export default {
   name: "MjyList",
@@ -287,6 +288,11 @@ export default {
       },
     }
   },
+  computed: {
+    ...mapGetters([
+      'id'
+    ]),
+  },
   created() {
     this.getList()
   },
diff --git a/src/views/business/resource/mjy/index.vue b/src/views/business/resource/mjy/index.vue
index 35635f7..fbe816e 100644
--- a/src/views/business/resource/mjy/index.vue
+++ b/src/views/business/resource/mjy/index.vue
@@ -29,10 +29,13 @@ export default {
         { key: 'mjyList', name:'page.business.resource.mjy.mjygl' },
         { key: 'ffjlList', name: 'page.business.resource.mjy.ffhsjl' },
       ],
-      active: 'mjyList',
+      active: this.$route.params.tab||'mjyList',
     }
   },
-  created() { },
+  created() { 
+     const obj = Object.assign({}, this.$route, { title:this.$t('page.business.resource.mjy.mjygl')}) 
+     this.$tab.updatePage(obj);
+  },
   methods: {
     show(row) {
       this.study = row