fix:[资源库管理][仪器管理]

src/views/business/resource/gsp/comps/ffjlList.vue

@@ -163,11 +163,11 @@
                 v-hasPermi="['business:resource:gsp:ffjlgd']">{{
                   $t('page.business.resource.gsp.guidang') }}</el-button>
               <!-- 解档 -->
-              <el-button type="text" v-if="scope.row.jlzt == 7" @click="handleJd(scope.row)"
+              <el-button type="text" v-if="scope.row.jlzt == 7  && id == scope.row.dasqrId" @click="handleJd(scope.row)"
                 v-hasPermi="['business:resource:gsp:ffjljd']">{{
                   $t('page.business.resource.gsp.jiedang') }}</el-button>
               <!-- 借阅 -->
-              <el-button type="text" v-if="scope.row.jlzt == 7 && scope.row.jyzt == 1" @click="handleJy(scope.row)"
+              <el-button type="text" v-if="scope.row.jlzt == 7 && scope.row.jyzt == 1 && id == scope.row.dasqrId" @click="handleJy(scope.row)"
                 v-hasPermi="['business:resource:gsp:ffjljy']">{{
                   $t('page.business.resource.gsp.jieyue') }}</el-button>
             </template>
@@ -204,6 +204,7 @@ import Jd from "./ffjl/Jd";
 import Xq from "./ffjl/Xq";
 import Jq from "./ffjl/Jq";
 import { deepClone } from "@/utils/index";
+import { mapGetters } from 'vuex'
 export default {
   name: "FfjlList",
   components: { Sd, Js, Gd, Jd, Jy, Xq, Jq },
@@ -238,6 +239,11 @@ export default {
   created() {
     this.getList()
   },
+  computed: {
+    ...mapGetters([
+      'id'
+    ]),
+  },
   methods: {
     //导出
     exportExcel() {

src/views/business/resource/gsp/comps/gspList.vue

@@ -182,7 +182,7 @@
                 <el-button type="text" @click="handleGh(scope.row)" v-hasPermi="['business:resource:gsp:gh']">{{
                   $t('page.business.resource.gsp.guihuan') }}</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.dasqrId">
                 <!-- 解档 -->
                 <el-button type="text" @click="handleJd(scope.row)" v-hasPermi="['business:resource:gsp:jd']">{{
                   $t('page.business.resource.gsp.jiedang') }}</el-button>
@@ -252,6 +252,7 @@ import Cz from "./gsp/Cz";
 import CzBatch from "./gsp/CzBatch";
 import Ysff from "./gsp/Ysff";
 import { deepClone } from "@/utils/index";
+import { mapGetters } from 'vuex'
 export default {
   name: "GspList",
   components: { Xz, Sd, Js, Gd, Xq, Jd, Bj, Shbj, Xgkc, Shxgkc, Jy, Gh, Cz, CzBatch, Ff, Ysff },
@@ -282,6 +283,11 @@ export default {
   created() {
     this.getList()
   },
+  computed: {
+    ...mapGetters([
+      'id'
+    ]),
+  },
   methods: {
     //导出
     exportExcel() {

src/views/business/resource/gsp/comps/rkjlList.vue

@@ -146,11 +146,11 @@
                 v-hasPermi="['business:resource:gsp:rkgd']">{{
                   $t('page.business.resource.gsp.guidang') }}</el-button>
               <!-- 解档 -->
-              <el-button type="text" v-if="scope.row.jlzt == 7" @click="handleJd(scope.row)"
+              <el-button type="text" v-if="scope.row.jlzt == 7 && id == scope.row.dasqrId" @click="handleJd(scope.row)"
                 v-hasPermi="['business:resource:gsp:rkjd']">{{
                   $t('page.business.resource.gsp.jiedang') }}</el-button>
               <!-- 借阅 -->
-              <el-button type="text" v-if="scope.row.jlzt == 7 && scope.row.jyzt == 1" @click="handleJy(scope.row)"
+              <el-button type="text" v-if="scope.row.jlzt == 7 && scope.row.jyzt == 1 && id == scope.row.dasqrId" @click="handleJy(scope.row)"
                 v-hasPermi="['business:resource:gsp:rkjy']">{{
                   $t('page.business.resource.gsp.jieyue') }}</el-button>
             </template>
@@ -190,6 +190,7 @@ import Xq from "./rkjl/Xq";
 import Xz from "./rkjl/Xz";
 import Bj from "./rkjl/Bj";
 import { deepClone } from "@/utils/index";
+import { mapGetters } from 'vuex'
 export default {
   name: "FfjlList",
   components: { Sd, Js, Gd, Jd, Jy, Xq, Xz, Bj },
@@ -221,6 +222,11 @@ export default {
       },
     }
   },
+  computed: {
+    ...mapGetters([
+      'id'
+    ]),
+  },
   created() {
     this.getList()
   },

src/views/business/resource/gsp/index.vue

@@ -32,10 +32,13 @@ export default {
         { key: 'rkjlList', name: this.$t('page.business.resource.gsp.gsprkjl') },
         { key: 'ffjlList', name: this.$t('page.business.resource.gsp.ffhsjl') },
       ],
-      active: 'gspList',
+      active: this.$route.params.tab || 'gspList',
     }
   },
-  created() { },
+  created() {
+    const obj = Object.assign({}, this.$route, { title: this.$t('page.business.resource.gsp.gspgl') })
+    this.$tab.updatePage(obj);
+  },
   methods: {
     show(row) {
       this.study = row

src/views/business/resource/sj/list.vue

@@ -160,7 +160,7 @@
                 <el-button type="text" @click="handleGd(scope.row)" v-hasPermi="['business:resource:sj:gd']">{{
                   $t('page.business.resource.sj.guidang') }}</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 && scope.row.dasqrId == id">
                 <!-- 解档 -->
                 <el-button type="text" @click="handleJd(scope.row)" v-hasPermi="['business:resource:sj:jd']">{{
                   $t('page.business.resource.sj.jiedang') }}</el-button>
@@ -212,7 +212,7 @@ import Xgkc from "./comps/Xgkc";
 import Jy from "./comps/Jy";
 import Cz from "./comps/Cz";
 import CzBatch from "./comps/CzBatch";
-
+import { mapGetters } from 'vuex'
 export default {
   name: "Sj",
   components: { Sd, Js, Gd, Xq, Jd, Bj, Xgkc, Jy, Cz, CzBatch },
@@ -240,6 +240,11 @@ export default {
       },
     }
   },
+  computed: {
+    ...mapGetters([
+      'id'
+    ]),
+  },
   created() {
     this.handleQuery()
   },

src/views/business/resource/yq/comps/detail.vue

@@ -81,8 +81,12 @@
 
 <script>
 import { yq_info, yqJcgj_list } from '@/api/business/yq/yq'
+import SelectDept from "@/views/business/comps/select/SelectDept";
 export default {
   name: "YqDetail",
+  components: {
+    SelectDept
+  },
   data() {
     return {
       loading: true,
@@ -114,7 +118,7 @@ export default {
       yqJcgj_list(this.queryParams).then((response) => {
         this.qmList = response.rows
         this.qmList.forEach(item => {
-          if(item.jcnr) {
+          if (item.jcnr) {
             item.jcnrList = JSON.parse(item.jcnr)
             //item.jcnr = Object.entries(JSON.parse(item.jcnr)).map(([key, value]) => `${key}:${value}`).join('\r\n');
           } else {

src/views/business/resource/yq/list.vue

@@ -14,8 +14,8 @@
           :start-placeholder="$t('form.startDate')" :end-placeholder="$t('form.endDate')">
         </el-date-picker>
       </el-form-item>
-      <el-form-item :label="$t('page.business.resource.yq.ssbm') + '：'" prop="bmId">
-        <el-input v-model="queryParams.bmId" placeholder="" clearable @keyup.enter.native="handleQuery" />
+      <el-form-item :label="$t('page.business.resource.yq.ssbm') + '：'" prop="bmMc">
+        <el-input v-model="queryParams.bmMc" placeholder="" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
 
       <el-form-item>
@@ -94,8 +94,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item :label="$t('page.business.resource.yq.ssbm')" prop="bmMc">
-              <el-input v-model="form.bmMc" :placeholder="$t('form.placeholderSelect')" />
+            <el-form-item :label="$t('page.business.resource.yq.ssbm')" prop="bmId">
+              <!-- <el-input v-model="form.bmMc" :placeholder="$t('form.placeholderSelect')" /> -->
+              <SelectDept v-model="form.bmId" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -214,7 +215,7 @@ export default {
         jzrq: [
           { required: true, message: this.$t('page.business.resource.yq.xcjzrq') + this.$t('form.notEmpty'), trigger: "change" },
         ],
-        bmMc: [
+        bmId: [
           { required: true, message: this.$t('page.business.resource.yq.ssbm') + this.$t('form.notEmpty'), trigger: "change" },
         ],
         wc: [