diff --git a/src/App.vue b/src/App.vue
index 29dfde3..d92e9c1 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -24,4 +24,14 @@ export default {
     width: 150px;
   }
 }
+/*详情 */
+.detail-container{
+  .header{
+     height: 40px;
+     line-height: 40px;
+     display: flex;
+     justify-items:flex-end;
+     box-shadow: 0 1px 3px 0 rgba(0, 0, 0, 0.12), 0 0 3px 0 rgba(0, 0, 0, 0.04);
+  }
+}
 </style>
diff --git a/src/assets/images/header.png b/src/assets/images/header.png
new file mode 100644
index 0000000..aa65b1e
Binary files /dev/null and b/src/assets/images/header.png differ
diff --git a/src/assets/images/logo-header.png b/src/assets/images/logo-header.png
new file mode 100644
index 0000000..018bb23
Binary files /dev/null and b/src/assets/images/logo-header.png differ
diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss
index bb87292..abc91a1 100644
--- a/src/assets/styles/index.scss
+++ b/src/assets/styles/index.scss
@@ -24,6 +24,7 @@ html {
 
 #app {
   height: 100%;
+  background-color: #f5f5f5;
 }
 
 *,
@@ -122,6 +123,8 @@ aside {
 //main-container全局样式
 .app-container {
   padding: 20px;
+  background-color: #fff;
+  margin: 10px 10px;
 }
 
 .components-container {
diff --git a/src/assets/styles/sidebar.scss b/src/assets/styles/sidebar.scss
index 3558293..2bd9cd2 100644
--- a/src/assets/styles/sidebar.scss
+++ b/src/assets/styles/sidebar.scss
@@ -10,12 +10,15 @@
   .sidebarHide {
     margin-left: 0!important;
   }
-
+ .theme-dark .is-active > .el-submenu__title{
+      border-left: 4px solid #49a3ff !important;
+ }
   .sidebar-container {
     -webkit-transition: width .28s;
     transition: width 0.28s;
     width: $base-sidebar-width !important;
     background-color: $base-menu-background;
+    // background: linear-gradient(to top, #e3f5fb, #ffffff);
     height: 100%;
     position: fixed;
     font-size: 0px;
@@ -80,7 +83,8 @@
     .submenu-title-noDropdown,
     .el-submenu__title {
       &:hover {
-        background-color: rgba(0, 0, 0, 0.06) !important;
+        background-color: #eaf2ff !important;
+        color: #44a0ff !important;
       }
     }
 
@@ -93,7 +97,8 @@
       min-width: $base-sidebar-width !important;
 
       &:hover {
-        background-color: rgba(0, 0, 0, 0.06) !important;
+               background-color: #eaf2ff !important;
+        color: #44a0ff !important;
       }
     }
 
diff --git a/src/assets/styles/variables.scss b/src/assets/styles/variables.scss
index 34484d4..f6efb30 100644
--- a/src/assets/styles/variables.scss
+++ b/src/assets/styles/variables.scss
@@ -9,17 +9,17 @@ $yellow:#FEC171;
 $panGreen: #30B08F;
 
 // 默认菜单主题风格
-$base-menu-color:#bfcbd9;
-$base-menu-color-active:#f4f4f5;
-$base-menu-background:#304156;
+$base-menu-color:#8c8c8c;
+$base-menu-color-active:#49a3ff;
+$base-menu-background:#ffffff;
 $base-logo-title-color: #ffffff;
 
-$base-menu-light-color:rgba(0,0,0,.70);
-$base-menu-light-background:#ffffff;
-$base-logo-light-title-color: #001529;
+$base-menu-light-color:#49a3ff;
+$base-menu-light-background:#eaf2ff;
+$base-logo-light-title-color: #49a3ff;
 
-$base-sub-menu-background:#1f2d3d;
-$base-sub-menu-hover:#001528;
+$base-sub-menu-background:#eaf2ff;
+$base-sub-menu-hover:#eaf2ff;
 
 // 自定义暗色菜单风格
 /**
diff --git a/src/components/ThemePicker/index.vue b/src/components/ThemePicker/index.vue
index a69ee45..4488305 100644
--- a/src/components/ThemePicker/index.vue
+++ b/src/components/ThemePicker/index.vue
@@ -1,7 +1,7 @@
 <template>
   <el-color-picker
     v-model="theme"
-    :predefine="['#409EFF', '#1890ff', '#304156','#212121','#11a983', '#13c2c2', '#6959CD', '#f5222d', ]"
+    :predefine="['#409EFF', '#1890ff', '#e7f7fd','#212121','#11a983', '#13c2c2', '#6959CD', '#f5222d', ]"
     class="theme-picker"
     popper-class="theme-picker-dropdown"
   />
diff --git a/src/lang/en.js b/src/lang/en.js
index 93f84eb..8486f43 100644
--- a/src/lang/en.js
+++ b/src/lang/en.js
@@ -26,7 +26,7 @@ export default {
     qmyy:'签名意义',
     lock:'lock',
     unlock:'unlock',
-    detail:'detail',
+    detail:'Detail',
     gd:'归档',
   },
   menu: {
diff --git a/src/layout/components/AppMain.vue b/src/layout/components/AppMain.vue
index 5273773..5085200 100644
--- a/src/layout/components/AppMain.vue
+++ b/src/layout/components/AppMain.vue
@@ -47,7 +47,7 @@ export default {
 <style lang="scss" scoped>
 .app-main {
   /* 50= navbar  50  */
-  min-height: calc(100vh - 50px);
+  min-height: calc(100vh - 100px);
   width: 100%;
   position: relative;
   overflow: hidden;
@@ -56,7 +56,7 @@ export default {
 .fixed-header + .app-main {
   overflow-y: auto;
   scrollbar-gutter: auto;
-  height: calc(100vh - 50px);
+  height: calc(100vh - 100px);
   min-height: 0px;
 }
 
@@ -71,12 +71,12 @@ export default {
 .hasTagsView {
   .app-main {
     /* 84 = navbar + tags-view = 50 + 34 */
-    min-height: calc(100vh - 84px);
+    min-height: calc(100vh - 100px);
   }
 
   .fixed-header + .app-main {
     margin-top: 84px;
-    height: calc(100vh - 84px);
+    height: calc(100vh - 100px);
     min-height: 0px;
   }
 }
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index ef95675..a0ec7b0 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -1,40 +1,39 @@
 <template>
   <div class="navbar">
-    <hamburger id="hamburger-container" :is-active="sidebar.opened" class="hamburger-container" @toggleClick="toggleSideBar" />
 
-    <breadcrumb v-if="!topNav" id="breadcrumb-container" class="breadcrumb-container" />
-    <top-nav v-if="topNav" id="topmenu-container" class="topmenu-container" />
+    <div class="navbar-header">
+      <div class="right-menu">
+        <template v-if="device !== 'mobile'">
 
-    
-    <div class="right-menu">
-      <template v-if="device!=='mobile'">
-
-        <!-- <screenfull id="screenfull" class="right-menu-item hover-effect" />
+          <!-- <screenfull id="screenfull" class="right-menu-item hover-effect" />
 
         <el-tooltip content="布局大小" effect="dark" placement="bottom">
           <size-select id="size-select" class="right-menu-item hover-effect" />
         </el-tooltip> -->
 
-      </template>
-
-      
-
-      <el-dropdown class="avatar-container right-menu-item hover-effect" trigger="hover">
-        <div class="avatar-wrapper">
-          <!-- <img :src="avatar" class="user-avatar"> -->
-          <span class="user-nickname"> {{ nickName }} </span>
-        </div>
-        <el-dropdown-menu slot="dropdown">
-          <router-link to="/user/profile">
-            <el-dropdown-item>{{ $t('login.profile') }}</el-dropdown-item>
-          </router-link>
-          <el-dropdown-item divided @click.native="logout">
-            <span>{{ $t('login.logOut') }}</span>
-          </el-dropdown-item>
-        </el-dropdown-menu>
-      </el-dropdown>
+        </template>
+        <el-dropdown class="avatar-container right-menu-item hover-effect" trigger="hover">
+          <div class="avatar-wrapper">
+            <img src="@/assets/images/profile.jpg" class="user-avatar">
+            <span class="user-nickname"> {{ nickName }} </span>
+          </div>
+          <el-dropdown-menu slot="dropdown">
+            <router-link to="/user/profile">
+              <el-dropdown-item>{{ $t('login.profile') }}</el-dropdown-item>
+            </router-link>
+            <el-dropdown-item divided @click.native="logout">
+              <span>{{ $t('login.logOut') }}</span>
+            </el-dropdown-item>
+          </el-dropdown-menu>
+        </el-dropdown>
+      </div>
+      <lang-select class="set-language" />
     </div>
-    <lang-select class="set-language" style="float: right;height: 100%;line-height: 50px;right: 10px;" />
+    <hamburger id="hamburger-container" :is-active="sidebar.opened" class="hamburger-container"
+      @toggleClick="toggleSideBar" />
+
+    <breadcrumb v-if="!topNav" id="breadcrumb-container" class="breadcrumb-container" />
+    <top-nav v-if="topNav" id="topmenu-container" class="topmenu-container" />
   </div>
 </template>
 
@@ -97,7 +96,7 @@ export default {
         this.$store.dispatch('LogOut').then(() => {
           location.href = '/user/work'
         })
-      }).catch(() => {})
+      }).catch(() => { })
     }
   }
 }
@@ -105,11 +104,29 @@ export default {
 
 <style lang="scss" scoped>
 .navbar {
-  height: 50px;
+  // height: 50px;
   overflow: hidden;
   position: relative;
   background: #fff;
-  box-shadow: 0 1px 4px rgba(0,21,41,.08);
+
+  // box-shadow: 0 1px 4px rgba(0,21,41,.08);
+  .navbar-header {
+    background-image: url("../../assets/images/header.png");
+    background-size: cover;
+    background-repeat: no-repeat;
+    height: 50px;
+    line-height: 50px;
+    display: flex;
+    justify-content: flex-end;
+
+  }
+
+  .set-language {
+    float: right;
+    height: 100%;
+    line-height: 50px;
+    right: 10px;
+  }
 
   .hamburger-container {
     line-height: 46px;
@@ -117,7 +134,7 @@ export default {
     float: left;
     cursor: pointer;
     transition: background .3s;
-    -webkit-tap-highlight-color:transparent;
+    -webkit-tap-highlight-color: transparent;
 
     &:hover {
       background: rgba(0, 0, 0, .025)
@@ -142,6 +159,7 @@ export default {
     float: right;
     height: 100%;
     line-height: 50px;
+    padding-right: 20px;
 
     &:focus {
       outline: none;
@@ -181,7 +199,7 @@ export default {
           border-radius: 50%;
         }
 
-        .user-nickname{
+        .user-nickname {
           position: relative;
           bottom: 10px;
           left: 2px;
diff --git a/src/layout/components/Sidebar/Logo.vue b/src/layout/components/Sidebar/Logo.vue
index ebc25ef..abd453d 100644
--- a/src/layout/components/Sidebar/Logo.vue
+++ b/src/layout/components/Sidebar/Logo.vue
@@ -1,20 +1,23 @@
 <template>
-  <div class="sidebar-logo-container" :class="{'collapse':collapse}" :style="{ backgroundColor: sideTheme === 'theme-dark' ? variables.menuBackground : variables.menuLightBackground }">
+  <div class="sidebar-logo-container" :class="{ 'collapse': collapse }"
+    :style="{ backgroundColor: sideTheme === 'theme-dark' ? variables.menuBackground : variables.menuLightBackground }">
     <transition name="sidebarLogoFade">
       <router-link v-if="collapse" key="collapse" class="sidebar-logo-link" to="/">
         <img v-if="logo" :src="logo" class="sidebar-logo" />
-        <h1 v-else class="sidebar-title" :style="{ color: sideTheme === 'theme-dark' ? variables.logoTitleColor : variables.logoLightTitleColor }">{{ $t('system.title') }} </h1>
+        <h1 v-else class="sidebar-title"
+          :style="{ color: sideTheme === 'theme-dark' ? variables.logoTitleColor : variables.logoLightTitleColor }">{{
+            $t('system.title') }} </h1>
       </router-link>
       <router-link v-else key="expand" class="sidebar-logo-link" to="/">
-        <img v-if="logo" :src="logo" class="sidebar-logo" />
-        <h1 class="sidebar-title" :style="{ color: sideTheme === 'theme-dark' ? variables.logoTitleColor : variables.logoLightTitleColor }">{{ $t('system.title') }} </h1>
+        <img v-if="logo" :src="logo" class="sidebar-expand-logo" />
+        <!-- <h1 class="sidebar-title" :style="{ color: sideTheme === 'theme-dark' ? variables.logoTitleColor : variables.logoLightTitleColor }">{{ $t('system.title') }} </h1> -->
       </router-link>
     </transition>
   </div>
 </template>
 
 <script>
-import logoImg from '@/assets/logo/logo.png'
+import logoImg from '@/assets/images/logo-header.png'
 import variables from '@/assets/styles/variables.scss'
 
 export default {
@@ -55,12 +58,16 @@ export default {
 .sidebar-logo-container {
   position: relative;
   width: 100%;
-  height: 50px;
+  height: 100px;
   line-height: 50px;
-  background: #2b2f3a;
+  background: #ffffff !important;
   text-align: center;
   overflow: hidden;
 
+  .sidebar-expand-logo {
+    margin-top: 18px;
+  }
+
   & .sidebar-logo-link {
     height: 100%;
     width: 100%;
diff --git a/src/layout/index.vue b/src/layout/index.vue
index e8b7c38..7a2768c 100644
--- a/src/layout/index.vue
+++ b/src/layout/index.vue
@@ -5,7 +5,7 @@
     <div :class="{hasTagsView:needTagsView,sidebarHide:sidebar.hide}" class="main-container">
       <div :class="{'fixed-header':fixedHeader}">
         <navbar @setLayout="setLayout"/>
-        <tags-view v-if="needTagsView"/>
+        <!-- <tags-view v-if="needTagsView"/> -->
       </div>
       <app-main/>
       <settings ref="settingRef"/>
diff --git a/src/views/business/resource/mjy/comps/Gd.vue b/src/views/business/resource/mjy/comps/Gd.vue
index 04de669..d8fac07 100644
--- a/src/views/business/resource/mjy/comps/Gd.vue
+++ b/src/views/business/resource/mjy/comps/Gd.vue
@@ -8,12 +8,7 @@ G<template>
           </el-alert>
           <el-row style="margin:10px 0px;">
             <el-col :span="24">
-              <el-table :data="selectList" border>
-                <el-table-column :label="$t('page.business.zykgl.mjy.mc')" align="left" prop="mc"
-                  :show-overflow-tooltip="true" />
-                <el-table-column :label="$t('page.business.zykgl.mjy.bh')" align="center" prop="bh"
-                  :show-overflow-tooltip="true" />
-              </el-table>
+              <SelectList :value="selectList"/>
             </el-col>
           </el-row>
         </template>
@@ -79,9 +74,11 @@ G<template>
 <script>
 import { mjy_gd, mjy_gdBatch } from "@/api/business/mjy/mjy"
 import { mapGetters } from 'vuex'
+import SelectList from "./SelectList";
 
 export default {
-  name: "MjySd",
+  name: "MjyGd",
+  components: { SelectList },
   data() {
     return {
       isBatch: false,
diff --git a/src/views/business/resource/mjy/comps/Sd.vue b/src/views/business/resource/mjy/comps/Sd.vue
index 09edb6c..89f8cbf 100644
--- a/src/views/business/resource/mjy/comps/Sd.vue
+++ b/src/views/business/resource/mjy/comps/Sd.vue
@@ -8,12 +8,7 @@ G<template>
           </el-alert>
           <el-row style="margin:10px 0px;">
             <el-col :span="24">
-              <el-table :data="selectList" border>
-                <el-table-column :label="$t('page.business.zykgl.mjy.mc')" align="left" prop="mc"
-                  :show-overflow-tooltip="true" />
-                <el-table-column :label="$t('page.business.zykgl.mjy.bh')" align="center" prop="bh"
-                  :show-overflow-tooltip="true" />
-              </el-table>
+              <SelectList :value="selectList"/>
             </el-col>
           </el-row>
         </template>
@@ -79,9 +74,11 @@ G<template>
 <script>
 import { mjy_sd, mjy_sdBatch } from "@/api/business/mjy/mjy"
 import { mapGetters } from 'vuex'
+import SelectList from "./SelectList";
 
 export default {
   name: "MjySd",
+  components: { SelectList },
   data() {
     return {
       isBatch: false,
diff --git a/src/views/business/resource/mjy/comps/SelectList.vue b/src/views/business/resource/mjy/comps/SelectList.vue
new file mode 100644
index 0000000..a4cba7f
--- /dev/null
+++ b/src/views/business/resource/mjy/comps/SelectList.vue
@@ -0,0 +1,38 @@
+G<template>
+  <div class="app-container">
+    <el-table :data="selectList" border>
+      <el-table-column :label="$t('page.business.zykgl.mjy.mc')" align="left" prop="mc" :show-overflow-tooltip="true" />
+      <el-table-column :label="$t('page.business.zykgl.mjy.bh')" align="left" prop="bh" :show-overflow-tooltip="true" />
+    </el-table>
+  </div>
+</template>
+
+<script>
+
+export default {
+  name: "MjySelectList",
+  data() {
+    return {
+      selectList: []
+    }
+  },
+  props: {
+    value: {
+      type: Array,
+      default: () => []
+    }
+  },
+  watch: {
+    value: {
+      immediate: true,
+      handler(v) {
+        this.selectList = v || []
+      }
+    },
+  },
+  created() {
+  },
+  methods: {
+  }
+}
+</script>
diff --git a/src/views/business/resource/mjy/comps/Xq.vue b/src/views/business/resource/mjy/comps/Xq.vue
new file mode 100644
index 0000000..15b05ab
--- /dev/null
+++ b/src/views/business/resource/mjy/comps/Xq.vue
@@ -0,0 +1,71 @@
+G<template>
+    <!-- 详情 -->
+   <div class="detail-container">
+    <div class="header">
+      <div>
+          <i class="el-icon-arrow-left"></i>
+      </div>
+    </div>
+       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+        <el-row>
+          <el-col :span="24">
+            <el-form-item :label="$t('form.qmyy')" prop="qmyy">
+              <el-input type="text" :value="form.qmyy" maxlength="50" disabled
+                :placeholder="$t('form.placeholderInput')" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item :label="$t('form.remark')" prop="remark">
+              <el-input type="textarea" v-model="form.remark" :rows="2" maxlength="500"
+                :placeholder="$t('form.placeholderInput')">
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item :label="$t('form.signer')">
+              <el-input type="text" v-model="nickName" maxlength="50" disabled
+                :placeholder="$t('form.placeholderInput')" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item :label="$t('form.password')" prop="sdrmm">
+              <el-input type="text" v-model="form.sdrmm" maxlength="20" :placeholder="$t('form.placeholderInput')" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+   </div>
+</template>
+
+<script>
+import { mjy_info } from "@/api/business/mjy/mjy"
+
+export default {
+  name: "MjyXq",
+  data() {
+    return {
+      open: false,
+      form: {},
+      rules: {
+      }
+    }
+  },
+  created() {
+  },
+  methods: {
+    show(row) {
+      mjy_info({ id: row.id }).then(response => {
+        this.form=response.data
+        this.open = false
+      })
+      this.open = true
+    }
+  }
+}
+</script>
diff --git a/src/views/business/resource/mjy/list.vue b/src/views/business/resource/mjy/list.vue
index d72e969..0551323 100644
--- a/src/views/business/resource/mjy/list.vue
+++ b/src/views/business/resource/mjy/list.vue
@@ -1,181 +1,212 @@
 <template>
-  <div class="app-container mjy">
-    <el-form :model="queryParams" ref="queryForm" class="search-area" size="small" :inline="true" label-width="88px">
-      <!-- 名称 -->
-      <el-form-item :label="$t('page.business.zykgl.mjy.mc') + '：'">
-        <el-input v-model="queryParams.mc" clearable @change="handleQuery" :placeholder="$t('form.placeholderInput')" />
-      </el-form-item>
-      <!-- 编号 -->
-      <el-form-item :label="$t('page.business.zykgl.mjy.bh') + '：'">
-        <el-input v-model="queryParams.bh" clearable @change="handleQuery" :placeholder="$t('form.placeholderInput')" />
-      </el-form-item>
-      <!-- 借阅状态 -->
-      <el-form-item :label="$t('page.business.zykgl.mjy.jyzt') + '：'">
-        <el-select v-model="queryParams.jyzt" :placeholder="$t('form.placeholderSelect')" clearable
-          @change="handleQuery">
-          <el-option key="1" :label="$t('page.business.zykgl.jyzt.wjy')" value="1" />
-          <el-option key="3" :label="$t('page.business.zykgl.jyzt.djy')" value="3" />
-          <el-option key="5" :label="$t('page.business.zykgl.jyzt.jyz')" value="5" />
-        </el-select>
-      </el-form-item>
-      <!-- 制剂状态 -->
-      <el-form-item :label="$t('page.business.zykgl.mjy.zjzt') + '：'">
-        <el-select v-model="queryParams.zjzt" :placeholder="$t('form.placeholderSelect')" clearable
-          @change="handleQuery">
-          <el-option key="1" :label="$t('page.business.zykgl.zjzt.rk')" value="1" />
-          <el-option key="3" :label="$t('page.business.zykgl.zjzt.yff')" value="3" />
-          <el-option key="5" :label="$t('page.business.zykgl.zjzt.ysd')" value="5" />
-          <el-option key="7" :label="$t('page.business.zykgl.zjzt.dgd')" value="7" />
-          <el-option key="9" :label="$t('page.business.zykgl.zjzt.gd')" value="9" />
-          <el-option key="11" :label="$t('page.business.zykgl.zjzt.djd')" value="11" />
-        </el-select>
-      </el-form-item>
-      <!-- 失效日期 -->
-      <el-form-item :label="$t('page.business.zykgl.mjy.sxrq') + '：'">
-        <el-date-picker v-model="daterange" 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>
-        <el-button type="primary" icon="el-icon-search" @click="handleQuery">{{ $t('form.search') }}</el-button>
-        <el-button icon="el-icon-refresh" @click="resetQuery">{{ $t('form.reset') }}</el-button>
-      </el-form-item>
-    </el-form>
+  <div>
+    <!-- 详情 -->
+    <template v-if="showDetail">
+      <Xq ref="Xq" @callback="handleQuery" />
+    </template>
 
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <!-- 批量发放 -->
-        <el-button type="primary" :disabled="multiple" @click="handlePlff" v-hasPermi="['business:resource:mjy:ff']">{{
-          $t('page.business.zykgl.mjy.plff') }}</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <!-- 批量处置药剂 -->
-        <el-button type="primary" :disabled="multiple" @click="handlePlczyj"
-          v-hasPermi="['business:resource:mjy:czyj']">{{ $t('page.business.zykgl.mjy.plczyj') }}</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <!-- 批量处置容器 -->
-        <el-button type="primary" :disabled="multiple" @click="handlePlczrq"
-          v-hasPermi="['business:resource:mjy:czrq']">{{ $t('page.business.zykgl.mjy.plczrq') }}</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <!-- 钥匙发放 -->
-        <el-button type="primary" :disabled="multiple" @click="handleYsff"
-          v-hasPermi="['business:resource:mjy:ysff']">{{ $t('page.business.zykgl.mjy.ysff') }}</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <!-- 批量锁定 -->
-        <el-button type="primary" :disabled="multiple" @click="handlePlsd" v-hasPermi="['business:resource:mjy:sd']">{{
-          $t('page.business.zykgl.mjy.plsd') }}</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <!-- 批量归档 -->
-        <el-button type="primary" :disabled="multiple" @click="handlePlgd" v-hasPermi="['business:resource:mjy:gd']">{{
-          $t('page.business.zykgl.mjy.plgd') }}</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <!-- 导出 -->
-        <el-button type="primary" :disabled="multiple" @click="handleDc" v-hasPermi="['business:resource:mjy:dc']">{{
-          $t('form.export') }}</el-button>
-      </el-col>
-    </el-row>
+    <!-- 列表 -->
+    <template v-else>
+      <div class="app-container mjy">
+        <el-form :model="queryParams" ref="queryForm" class="search-area" size="small" :inline="true"
+          label-width="88px">
+          <!-- 名称 -->
+          <el-form-item :label="$t('page.business.zykgl.mjy.mc') + '：'">
+            <el-input v-model="queryParams.mc" clearable @change="handleQuery"
+              :placeholder="$t('form.placeholderInput')" />
+          </el-form-item>
+          <!-- 编号 -->
+          <el-form-item :label="$t('page.business.zykgl.mjy.bh') + '：'">
+            <el-input v-model="queryParams.bh" clearable @change="handleQuery"
+              :placeholder="$t('form.placeholderInput')" />
+          </el-form-item>
+          <!-- 借阅状态 -->
+          <el-form-item :label="$t('page.business.zykgl.mjy.jyzt') + '：'">
+            <el-select v-model="queryParams.jyzt" :placeholder="$t('form.placeholderSelect')" clearable
+              @change="handleQuery">
+              <el-option key="1" :label="$t('page.business.zykgl.jyzt.wjy')" value="1" />
+              <el-option key="3" :label="$t('page.business.zykgl.jyzt.djy')" value="3" />
+              <el-option key="5" :label="$t('page.business.zykgl.jyzt.jyz')" value="5" />
+            </el-select>
+          </el-form-item>
+          <!-- 制剂状态 -->
+          <el-form-item :label="$t('page.business.zykgl.mjy.zjzt') + '：'">
+            <el-select v-model="queryParams.zjzt" :placeholder="$t('form.placeholderSelect')" clearable
+              @change="handleQuery">
+              <el-option key="1" :label="$t('page.business.zykgl.zjzt.rk')" value="1" />
+              <el-option key="3" :label="$t('page.business.zykgl.zjzt.yff')" value="3" />
+              <el-option key="5" :label="$t('page.business.zykgl.zjzt.ysd')" value="5" />
+              <el-option key="7" :label="$t('page.business.zykgl.zjzt.dgd')" value="7" />
+              <el-option key="9" :label="$t('page.business.zykgl.zjzt.gd')" value="9" />
+              <el-option key="11" :label="$t('page.business.zykgl.zjzt.djd')" value="11" />
+            </el-select>
+          </el-form-item>
+          <!-- 失效日期 -->
+          <el-form-item :label="$t('page.business.zykgl.mjy.sxrq') + '：'">
+            <el-date-picker v-model="daterange" 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>
+            <el-button type="primary" icon="el-icon-search" @click="handleQuery">{{ $t('form.search') }}</el-button>
+            <el-button icon="el-icon-refresh" @click="resetQuery">{{ $t('form.reset') }}</el-button>
+          </el-form-item>
+        </el-form>
 
-    <el-table v-loading="loading" :data="list" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" :selectable="checkSelectable" />
-      <el-table-column :label="$t('page.business.zykgl.mjy.mc')" align="left" prop="mc" :show-overflow-tooltip="true" />
-      <el-table-column :label="$t('page.business.zykgl.mjy.bh')" align="center" prop="bh"
-        :show-overflow-tooltip="true" />
-      <el-table-column :label="$t('page.business.zykgl.mjy.nd')" align="center">
-        <template slot-scope="scope">
-          {{ scope.row.nd }}{{ scope.row.nddw }}
-        </template>
-      </el-table-column>
-      <el-table-column :label="$t('page.business.zykgl.mjy.kcl')" align="center">
-        <template slot-scope="scope">
-          {{ scope.row.kc }}{{ scope.row.kcdw }}
-        </template>
-      </el-table-column>
-      <el-table-column :label="$t('page.business.zykgl.mjy.sxrq')" align="center" prop="sxrq" width="150px" />
-      <el-table-column :label="$t('page.business.zykgl.mjy.zcgMc')" align="center" prop="zcgMc" width="130px" />
-      <el-table-column :label="$t('page.business.zykgl.mjy.cctj')" align="center" prop="cctj" width="130px" />
-      <el-table-column :label="$t('page.business.zykgl.mjy.ccwz')" align="center" prop="ccwz" width="130px" />
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <!-- 批量发放 -->
+            <el-button type="primary" :disabled="multiple" @click="handlePlff"
+              v-hasPermi="['business:resource:mjy:ff']">{{
+                $t('page.business.zykgl.mjy.plff') }}</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <!-- 批量处置药剂 -->
+            <el-button type="primary" :disabled="multiple" @click="handlePlczyj"
+              v-hasPermi="['business:resource:mjy:czyj']">{{
+                $t('page.business.zykgl.mjy.plczyj') }}</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <!-- 批量处置容器 -->
+            <el-button type="primary" :disabled="multiple" @click="handlePlczrq"
+              v-hasPermi="['business:resource:mjy:czrq']">{{
+                $t('page.business.zykgl.mjy.plczrq') }}</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <!-- 钥匙发放 -->
+            <el-button type="primary" :disabled="multiple" @click="handleYsff"
+              v-hasPermi="['business:resource:mjy:ysff']">{{
+                $t('page.business.zykgl.mjy.ysff') }}</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <!-- 批量锁定 -->
+            <el-button type="primary" :disabled="multiple" @click="handlePlsd"
+              v-hasPermi="['business:resource:mjy:sd']">{{
+                $t('page.business.zykgl.mjy.plsd') }}</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <!-- 批量归档 -->
+            <el-button type="primary" :disabled="multiple" @click="handlePlgd"
+              v-hasPermi="['business:resource:mjy:gd']">{{
+                $t('page.business.zykgl.mjy.plgd') }}</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <!-- 导出 -->
+            <el-button type="primary" :disabled="multiple" @click="handleDc"
+              v-hasPermi="['business:resource:mjy:dc']">{{
+                $t('form.export') }}</el-button>
+          </el-col>
+        </el-row>
 
-      <el-table-column :label="$t('page.business.zykgl.mjy.zjzt')" align="center" width="150px">
-        <template slot-scope="scope">
-          <span v-if="scope.row.zjzt == 1">{{ $t('page.business.zykgl.zjzt.rk') }}</span>
-          <span v-if="scope.row.zjzt == 3">{{ $t('page.business.zykgl.zjzt.yff') }}</span>
-          <span v-if="scope.row.zjzt == 5">{{ $t('page.business.zykgl.zjzt.ysd') }}</span>
-          <span v-if="scope.row.zjzt == 7">{{ $t('page.business.zykgl.zjzt.dgd') }}</span>
-          <span v-if="scope.row.zjzt == 9">{{ $t('page.business.zykgl.zjzt.gd') }}</span>
-          <span v-if="scope.row.zjzt == 11">{{ $t('page.business.zykgl.zjzt.djd') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column :label="$t('page.business.zykgl.mjy.jyzt')" align="center" width="150px">
-        <template slot-scope="scope">
-          <span v-if="scope.row.jyzt == 1">{{ $t('page.business.zykgl.jyzt.wjy') }}</span>
-          <span v-if="scope.row.jyzt == 3">{{ $t('page.business.zykgl.jyzt.djy') }}</span>
-          <span v-if="scope.row.jyzt == 5">{{ $t('page.business.zykgl.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 size="mini" type="text" @click="handleffys(scope.row)"
-            v-hasPermi="['business:resource:mjy:list']">{{ $t('form.detail') }}</el-button>
-          <!-- 发放 -->
-          <el-button size="mini" type="text" @click="handleffys(scope.row)" v-hasPermi="['business:resource:mjy:ff']">{{
-            $t('page.business.zykgl.mjy.ff') }}</el-button>
-          <!-- 归还 -->
-          <el-button size="mini" type="text" @click="handleghys(scope.row)" v-hasPermi="['business:resource:mjy:gh']">{{
-            $t('page.business.zykgl.mjy.gh') }}</el-button>
-          <!-- 处置药剂 -->
-          <el-button size="mini" type="text" @click="handleghys(scope.row)"
-            v-hasPermi="['business:resource:mjy:czyj']">{{
-              $t('page.business.zykgl.mjy.czyj') }}</el-button>
-          <!-- 处置容器 -->
-          <el-button size="mini" type="text" @click="handleghys(scope.row)"
-            v-hasPermi="['business:resource:mjy:czrq']">{{
-              $t('page.business.zykgl.mjy.czrq') }}</el-button>
-          <!-- 编辑 -->
-          <el-button size="mini" type="text" @click="handleghys(scope.row)" v-hasPermi="['business:resource:mjy:bj']">{{
-            $t('form.edit') }}</el-button>
-          <!-- 审核编辑 -->
-          <el-button size="mini" type="text" @click="handleghys(scope.row)"
-            v-hasPermi="['business:resource:mjy:shbj']">{{
-              $t('page.business.zykgl.mjy.shbj') }}</el-button>
-          <!-- 修改库存 -->
-          <el-button size="mini" type="text" @click="handleghys(scope.row)"
-            v-hasPermi="['business:resource:mjy:xgkc']">{{
-              $t('page.business.zykgl.mjy.xgkc') }}</el-button>
-          <!-- 审核修改库存 -->
-          <el-button size="mini" type="text" @click="handleghys(scope.row)"
-            v-hasPermi="['business:resource:mjy:shxgkc']">{{
-              $t('page.business.zykgl.mjy.shxgkc') }}</el-button>
-          <!-- 锁定 -->
-          <el-button size="mini" type="text" @click="handleSd(scope.row)" v-hasPermi="['business:resource:mjy:sd']">{{
-            $t('form.lock') }}</el-button>
-          <!-- 解锁 -->
-          <el-button size="mini" type="text" @click="handleJs(scope.row)" v-hasPermi="['business:resource:mjy:js']">{{
-            $t('form.unlock') }}</el-button>
-          <!-- 归档 -->
-          <el-button size="mini" type="text" @click="handleGd(scope.row)" v-hasPermi="['business:resource:mjy:gd']">{{
-            $t('page.business.zykgl.mjy.gd') }}</el-button>
-          <!-- 解档 -->
-          <el-button size="mini" type="text" @click="handleghys(scope.row)" v-hasPermi="['business:resource:mjy:jd']">{{
-            $t('page.business.zykgl.mjy.jd') }}</el-button>
-          <!-- 借阅 -->
-          <el-button size="mini" type="text" @click="handleghys(scope.row)" v-hasPermi="['business:resource:mjy:jy']">{{
-            $t('page.business.zykgl.mjy.jy') }}</el-button>
-          <!-- 归还 -->
-          <el-button size="mini" type="text" @click="handleghys(scope.row)" v-hasPermi="['business:resource:mjy:gh']">{{
-            $t('page.business.zykgl.mjy.gh') }}</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
+        <el-table v-loading="loading" :data="list" @selection-change="handleSelectionChange">
+          <el-table-column type="selection" width="55" align="center" :selectable="checkSelectable" />
+          <el-table-column :label="$t('page.business.zykgl.mjy.mc')" align="left" prop="mc"
+            :show-overflow-tooltip="true" />
+          <el-table-column :label="$t('page.business.zykgl.mjy.bh')" align="center" prop="bh"
+            :show-overflow-tooltip="true" />
+          <el-table-column :label="$t('page.business.zykgl.mjy.nd')" align="center">
+            <template slot-scope="scope">
+              {{ scope.row.nd }}{{ scope.row.nddw }}
+            </template>
+          </el-table-column>
+          <el-table-column :label="$t('page.business.zykgl.mjy.kcl')" align="center">
+            <template slot-scope="scope">
+              {{ scope.row.kc }}{{ scope.row.kcdw }}
+            </template>
+          </el-table-column>
+          <el-table-column :label="$t('page.business.zykgl.mjy.sxrq')" align="center" prop="sxrq" width="150px" />
+          <el-table-column :label="$t('page.business.zykgl.mjy.zcgMc')" align="center" prop="zcgMc" width="130px" />
+          <el-table-column :label="$t('page.business.zykgl.mjy.cctj')" align="center" prop="cctj" width="130px" />
+          <el-table-column :label="$t('page.business.zykgl.mjy.ccwz')" align="center" prop="ccwz" width="130px" />
 
-    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
-      @pagination="getList" />
+          <el-table-column :label="$t('page.business.zykgl.mjy.zjzt')" align="center" width="150px">
+            <template slot-scope="scope">
+              <span v-if="scope.row.zjzt == 1">{{ $t('page.business.zykgl.zjzt.rk') }}</span>
+              <span v-if="scope.row.zjzt == 3">{{ $t('page.business.zykgl.zjzt.yff') }}</span>
+              <span v-if="scope.row.zjzt == 5">{{ $t('page.business.zykgl.zjzt.ysd') }}</span>
+              <span v-if="scope.row.zjzt == 7">{{ $t('page.business.zykgl.zjzt.dgd') }}</span>
+              <span v-if="scope.row.zjzt == 9">{{ $t('page.business.zykgl.zjzt.gd') }}</span>
+              <span v-if="scope.row.zjzt == 11">{{ $t('page.business.zykgl.zjzt.djd') }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column :label="$t('page.business.zykgl.mjy.jyzt')" align="center" width="150px">
+            <template slot-scope="scope">
+              <span v-if="scope.row.jyzt == 1">{{ $t('page.business.zykgl.jyzt.wjy') }}</span>
+              <span v-if="scope.row.jyzt == 3">{{ $t('page.business.zykgl.jyzt.djy') }}</span>
+              <span v-if="scope.row.jyzt == 5">{{ $t('page.business.zykgl.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 size="mini" type="text" @click="handleXq(scope.row)"
+                v-hasPermi="['business:resource:mjy:list']">{{
+                  $t('form.detail') }}</el-button>
+              <!-- 发放 -->
+              <el-button size="mini" type="text" @click="handleffys(scope.row)"
+                v-hasPermi="['business:resource:mjy:ff']">{{
+                  $t('page.business.zykgl.mjy.ff') }}</el-button>
+              <!-- 归还 -->
+              <el-button size="mini" type="text" @click="handleghys(scope.row)"
+                v-hasPermi="['business:resource:mjy:gh']">{{
+                  $t('page.business.zykgl.mjy.gh') }}</el-button>
+              <!-- 处置药剂 -->
+              <el-button size="mini" type="text" @click="handleghys(scope.row)"
+                v-hasPermi="['business:resource:mjy:czyj']">{{
+                  $t('page.business.zykgl.mjy.czyj') }}</el-button>
+              <!-- 处置容器 -->
+              <el-button size="mini" type="text" @click="handleghys(scope.row)"
+                v-hasPermi="['business:resource:mjy:czrq']">{{
+                  $t('page.business.zykgl.mjy.czrq') }}</el-button>
+              <!-- 编辑 -->
+              <el-button size="mini" type="text" @click="handleghys(scope.row)"
+                v-hasPermi="['business:resource:mjy:bj']">{{
+                  $t('form.edit') }}</el-button>
+              <!-- 审核编辑 -->
+              <el-button size="mini" type="text" @click="handleghys(scope.row)"
+                v-hasPermi="['business:resource:mjy:shbj']">{{
+                  $t('page.business.zykgl.mjy.shbj') }}</el-button>
+              <!-- 修改库存 -->
+              <el-button size="mini" type="text" @click="handleghys(scope.row)"
+                v-hasPermi="['business:resource:mjy:xgkc']">{{
+                  $t('page.business.zykgl.mjy.xgkc') }}</el-button>
+              <!-- 审核修改库存 -->
+              <el-button size="mini" type="text" @click="handleghys(scope.row)"
+                v-hasPermi="['business:resource:mjy:shxgkc']">{{
+                  $t('page.business.zykgl.mjy.shxgkc') }}</el-button>
+              <!-- 锁定 -->
+              <el-button size="mini" type="text" @click="handleSd(scope.row)"
+                v-hasPermi="['business:resource:mjy:sd']">{{
+                  $t('form.lock') }}</el-button>
+              <!-- 解锁 -->
+              <el-button size="mini" type="text" @click="handleJs(scope.row)"
+                v-hasPermi="['business:resource:mjy:js']">{{
+                  $t('form.unlock') }}</el-button>
+              <!-- 归档 -->
+              <el-button size="mini" type="text" @click="handleGd(scope.row)"
+                v-hasPermi="['business:resource:mjy:gd']">{{
+                  $t('page.business.zykgl.mjy.gd') }}</el-button>
+              <!-- 解档 -->
+              <el-button size="mini" type="text" @click="handleghys(scope.row)"
+                v-hasPermi="['business:resource:mjy:jd']">{{
+                  $t('page.business.zykgl.mjy.jd') }}</el-button>
+              <!-- 借阅 -->
+              <el-button size="mini" type="text" @click="handleghys(scope.row)"
+                v-hasPermi="['business:resource:mjy:jy']">{{
+                  $t('page.business.zykgl.mjy.jy') }}</el-button>
+              <!-- 归还 -->
+              <el-button size="mini" type="text" @click="handleghys(scope.row)"
+                v-hasPermi="['business:resource:mjy:gh']">{{
+                  $t('page.business.zykgl.mjy.gh') }}</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+
+        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
+          :limit.sync="queryParams.pageSize" @pagination="getList" />
+      </div>
+    </template>
 
     <!-- 锁定 -->
     <Sd ref="Sd" @callback="handleQuery" />
@@ -191,12 +222,14 @@ import { mjy_list } from "@/api/business/mjy/mjy"
 import Sd from "./comps/Sd";
 import Js from "./comps/Js";
 import Gd from "./comps/Gd";
+import Xq from "./comps/Xq";
 
 export default {
   name: "Mjy",
-  components: { Sd, Js, Gd },
+  components: { Sd, Js, Gd, Xq },
   data() {
     return {
+      showDetail: false,
       daterange: [],
       loading: true,
       single: true,
@@ -222,24 +255,40 @@ export default {
     this.getList()
   },
   methods: {
+    //是否可勾选
+    checkSelectable(row) {
+      return true;
+    },
+    //详情
+    handleXq(row) {
+      this.showDetail = true
+      this.$refs.Xq.show(row)
+    },
+    //批量解锁
     handlePljs() {
       this.$refs.Js.showBatch(this.selectList)
     },
+    //解锁
     handleJs(row) {
       this.$refs.Js.show(row)
     },
+    //批量归档
     handlePlgd() {
       this.$refs.Gd.showBatch(this.selectList)
     },
+    //归档
     handleGd(row) {
       this.$refs.Gd.show(row)
     },
+    //批量锁定
     handlePlsd() {
       this.$refs.Sd.showBatch(this.selectList)
     },
+    //锁定
     handleSd(row) {
       this.$refs.Sd.show(row)
     },
+    //获取列表
     getList() {
       if (this.daterange != null && this.daterange.length > 0) {
         this.queryParams.startDate = this.daterange[0]
@@ -255,14 +304,17 @@ export default {
         this.loading = false
       })
     },
+    //查询
     handleQuery() {
       this.queryParams.pageNum = 1
       this.getList()
     },
+    //重置
     resetQuery() {
       this.resetForm("queryForm")
       this.handleQuery()
     },
+    //勾选回调
     handleSelectionChange(selection) {
       this.single = selection.length !== 1
       this.multiple = !selection.length
diff --git a/src/views/business/resource/zcg/comps/SelectList.vue b/src/views/business/resource/zcg/comps/SelectList.vue
new file mode 100644
index 0000000..78d91bd
--- /dev/null
+++ b/src/views/business/resource/zcg/comps/SelectList.vue
@@ -0,0 +1,40 @@
+G<template>
+  <div class="app-container">
+    <el-table :data="selectList" border>
+      <el-table-column :label="$t('page.business.zykgl.zcg.zcg')" align="left" prop="mc" width="200px" />
+      <el-table-column :label="$t('page.business.zykgl.zcg.ys1jyr')" align="center" prop="lqr1Mc" width="150px" />
+      <el-table-column :label="$t('page.business.zykgl.zcg.ys2jyr')" align="center" prop="lqr2Mc" width="150px" />
+      <el-table-column :label="$t('page.business.zykgl.zcg.glyj')" align="center" prop="glyj" />
+    </el-table>
+  </div>
+</template>
+
+<script>
+
+export default {
+  name: "ZcgSelectList",
+  data() {
+    return {
+      selectList: []
+    }
+  },
+  props: {
+    value: {
+      type: Array,
+      default: () => []
+    }
+  },
+  watch: {
+    value: {
+      immediate: true,
+      handler(v) {
+        this.selectList = v || []
+      }
+    },
+  },
+  created() {
+  },
+  methods: {
+  }
+}
+</script>
diff --git a/src/views/business/resource/zcg/comps/Ysff.vue b/src/views/business/resource/zcg/comps/Ysff.vue
index c4004f9..1033d85 100644
--- a/src/views/business/resource/zcg/comps/Ysff.vue
+++ b/src/views/business/resource/zcg/comps/Ysff.vue
@@ -81,7 +81,7 @@
 </template>
 
 <script>
-import { zcg_yyff } from "@/api/business/zcg/zcg"
+import { zcg_ysff } from "@/api/business/zcg/zcg"
 import { mapGetters } from 'vuex'
 
 export default {
@@ -159,7 +159,7 @@ export default {
     save() {
       this.$refs["form"].validate(valid => {
         if (valid) {
-          zcg_yyff(this.form).then(response => {
+          zcg_ysff(this.form).then(response => {
             this.open = false
             this.$emit('callback')
           })
diff --git a/src/views/business/resource/zcg/comps/Ysgh.vue b/src/views/business/resource/zcg/comps/Ysgh.vue
index f1d4768..d38ffde 100644
--- a/src/views/business/resource/zcg/comps/Ysgh.vue
+++ b/src/views/business/resource/zcg/comps/Ysgh.vue
@@ -9,14 +9,7 @@ G<template>
           </el-alert>
           <el-row style="margin:10px 0px;">
             <el-col :span="24">
-              <el-table :data="selectList" border>
-                <el-table-column :label="$t('page.business.zykgl.zcg.zcg')" align="left" prop="mc" width="200px" />
-                <el-table-column :label="$t('page.business.zykgl.zcg.ys1jyr')" align="center" prop="lqr1Mc"
-                  width="150px" />
-                <el-table-column :label="$t('page.business.zykgl.zcg.ys2jyr')" align="center" prop="lqr2Mc"
-                  width="150px" />
-                <el-table-column :label="$t('page.business.zykgl.zcg.glyj')" align="center" prop="glyj" />
-              </el-table>
+              <SelectList :value="selectList"/>
             </el-col>
           </el-row>
         </template>
@@ -93,9 +86,11 @@ G<template>
 <script>
 import { zcg_ysgh, zcg_ysghBatch } from "@/api/business/zcg/zcg"
 import { mapGetters } from 'vuex'
+import SelectList from "./SelectList";
 
 export default {
   name: "ZcgYsgh",
+  components: { SelectList },
   data() {
     return {
       isBatch: false,
diff --git a/src/views/business/resource/zcg/list.vue b/src/views/business/resource/zcg/list.vue
index 5500c8c..f758a66 100644
--- a/src/views/business/resource/zcg/list.vue
+++ b/src/views/business/resource/zcg/list.vue
@@ -101,7 +101,7 @@ export default {
     this.getList()
   },
   methods: {
-    //勾选
+     //是否可勾选
     checkSelectable(row) {
       return row.zt === 5 //只能是借用中的才能勾选
     },