diff --git a/src/api/business/gyzj/gyzj.js b/src/api/business/gyzj/gyzj.js
index 45744b2..68da9d2 100644
--- a/src/api/business/gyzj/gyzj.js
+++ b/src/api/business/gyzj/gyzj.js
@@ -8,6 +8,15 @@ export function list(query) {
     params: query
   })
 }
+// 列表
+export function studyList(query) {
+  return request({
+    url: '/system/business/gyzj/studyList',
+    method: 'get',
+    params: query
+  })
+}
+
 // 稽查轨迹列表
 export function jcgjList(query) {
   return request({
diff --git a/src/api/business/mjy/mjy.js b/src/api/business/mjy/mjy.js
index 9eceb81..348fdcf 100644
--- a/src/api/business/mjy/mjy.js
+++ b/src/api/business/mjy/mjy.js
@@ -8,6 +8,16 @@ export function list(query) {
     params: query
   })
 }
+
+// 列表
+export function studyList(query) {
+  return request({
+    url: '/system/business/mjy/studyList',
+    method: 'get',
+    params: query
+  })
+}
+
 // 稽查轨迹列表
 export function jcgjList(query) {
   return request({
diff --git a/src/lang/en/business/study/studyEnter.js b/src/lang/en/business/study/studyEnter.js
index ad08c0d..8e4e81f 100644
--- a/src/lang/en/business/study/studyEnter.js
+++ b/src/lang/en/business/study/studyEnter.js
@@ -16,5 +16,13 @@ export default {
   czfzr: 'Leader',
   xzfzr: 'Choose',
 
-  pzfflb: '配置方法列表'
+  pzfflb: '配置方法列表',
+
+  
+  sjlb:'试剂列表',
+  gsplb:'供试品列表',
+  gyzjlb:'给药制剂列表',
+  mjylb:'麻精药列表',
+  xblb:'细胞列表',
+  xjlb:'细菌列表',
 }
diff --git a/src/lang/zh/business/study/studyEnter.js b/src/lang/zh/business/study/studyEnter.js
index 06b55de..7d65355 100644
--- a/src/lang/zh/business/study/studyEnter.js
+++ b/src/lang/zh/business/study/studyEnter.js
@@ -16,5 +16,13 @@ export default {
   czfzr: '学科/操作负责人',
   xzfzr: '选择负责人',
 
-  pzfflb: '配置方法列表'
+  pzfflb: '配置方法列表',
+
+  
+  sjlb:'试剂列表',
+  gsplb:'供试品列表',
+  gyzjlb:'给药制剂列表',
+  mjylb:'麻精药列表',
+  xblb:'细胞列表',
+  xjlb:'细菌列表',
 }
diff --git a/src/views/business/study/comp/wzlb.vue b/src/views/business/study/comp/wzlb.vue
index 5078b6c..97da80d 100644
--- a/src/views/business/study/comp/wzlb.vue
+++ b/src/views/business/study/comp/wzlb.vue
@@ -31,6 +31,16 @@
       </el-form>
     </div>
     <div class="syxx-content">
+      <div class="search-box" v-show="!showDetail">
+        <div class="search-item" :class="active === item.key ? 'active' : ''" v-for="(item, index) in tabList"
+          :key="index" @click="changeTab(item)">
+          {{ item.name }}
+        </div>
+      </div>
+       <div class="content-box">
+        <gyzjList v-if="active === 'gyzjlb'" :study="studyInfo" @showDetail="showDetailCallback" />
+        <mjyList v-if="active === 'mjylb'" :study="studyInfo" @showDetail="showDetailCallback"/>
+      </div>
     </div>
 
   </div>
@@ -39,7 +49,8 @@
 <script>
 import { checkPermi, checkRole } from "@/utils/permission";
 import { study_info } from "@/api/business/study/study"
-import { studySubject_listByStudyId } from '@/api/business/study/studySubject'
+import gyzjList from './wzlb/gyzjList.vue'
+import mjyList from './wzlb/mjyList.vue'
 export default {
   name: 'StudyWzlb',
   props: {
@@ -59,13 +70,21 @@ export default {
       }
     },
   },
-  components: {  },
+  components: {gyzjList,mjyList},
   data() {
     return {
       showDetail: false,
       studyId: '',
-      studyInfo:{},
-      subjectList: []
+      studyInfo: {},
+      tabList: [
+        { key: 'sjlb', name: this.$t('page.business.study.studyEnter.sjlb') },
+        { key: 'gsplb', name: this.$t('page.business.study.studyEnter.gsplb') },
+        { key: 'gyzjlb', name: this.$t('page.business.study.studyEnter.gyzjlb') },
+        { key: 'mjylb', name: this.$t('page.business.study.studyEnter.mjylb') },
+        { key: 'xblb', name: this.$t('page.business.study.studyEnter.xblb') },
+        { key: 'xjlb', name: this.$t('page.business.study.studyEnter.xjlb') }
+      ],
+      active: 'sjlb',
     }
   },
   created() {
@@ -73,18 +92,11 @@ export default {
   methods: {
     checkPermi,
     checkRole,
-    getstudySubject() {
-      studySubject_listByStudyId({ studyId: this.studyId }).then(response => {
-        this.subjectList = response.data;
-      }).finally(() => {
-        this.$modal.closeLoading()
-      })
-    },
     getStudyInfo() {
       this.$modal.loading()
       study_info({ id: this.studyId }).then(response => {
         this.studyInfo = response.data
-        this.getstudySubject()
+        this.$modal.closeLoading()
       }).finally(() => {
         this.$modal.closeLoading()
       })
@@ -92,13 +104,53 @@ export default {
     showDetailCallback(val) {
       this.showDetail = val
       this.$emit('showDetail', val)
+    },
+    changeTab(item) {
+      if (this.active !== item.key) {
+        this.active = item.key
+      }
     }
   }
 }
 </script>
 <style lang="scss" scoped>
 .study-syxx {
+ .search-box {
+    background: #fff;
+    padding: 0;
+    border-radius: 3px;
+    margin-bottom: 10px;
+
+    display: flex;
+    flex-direction: row;
+    align-items: center;
 
+    .search-item {
+      padding: 10px 20px;
+      font-size: 14px;
+      cursor: pointer;
+
+      &.active {
+        background: #1890ff;
+        color: #fff;
+      }
+
+      &:hover {
+        background: #46a6ff;
+        color: #fff;
+      }
+
+      &:first-child {
+        border-top-left-radius: 3px;
+        border-bottom-left-radius: 3px;
+      }
+
+      &:last-child {
+        border-top-right-radius: 3px;
+        border-bottom-right-radius: 3px;
+      }
+    }
+  }
   .syxx-top {
     background: #fff;
     padding: 20px;
@@ -135,8 +187,6 @@ export default {
     }
   }
 
-  .syxx-content {
-    
-  }
+  .syxx-content {}
 }
 </style>
diff --git a/src/views/business/study/comp/wzlb/gyzjList.vue b/src/views/business/study/comp/wzlb/gyzjList.vue
new file mode 100644
index 0000000..fb898e4
--- /dev/null
+++ b/src/views/business/study/comp/wzlb/gyzjList.vue
@@ -0,0 +1,235 @@
+<template>
+  <div >
+    <!-- 列表 -->
+    <div>
+      <div class="gyzj" v-show="!showDetail">
+        <el-form :model="queryParams" ref="queryForm" class="search-area" :inline="true" label-width="88px">
+          <!-- 名称 -->
+          <el-form-item :label="$t('page.business.resource.gyzj.mc') + '：'">
+            <el-input v-model="queryParams.mc" clearable @change="handleQuery"
+              :placeholder="$t('form.placeholderInput')" />
+          </el-form-item>
+          <!-- 编号 -->
+          <el-form-item :label="$t('page.business.resource.gyzj.bh') + '：'">
+            <el-input v-model="queryParams.bh" clearable @change="handleQuery"
+              :placeholder="$t('form.placeholderInput')" />
+          </el-form-item>
+          <!-- 制剂状态 -->
+          <el-form-item :label="$t('page.business.resource.gyzj.zjzt') + '：'">
+            <el-select v-model="queryParams.zjzt" :placeholder="$t('form.placeholderSelect')" clearable
+              @change="handleQuery">
+              <el-option :label="$t('page.business.resource.resource.zjzt.rk')" :value="1" />
+              <el-option :label="$t('page.business.resource.resource.zjzt.yff')" :value="3" />
+              <el-option :label="$t('page.business.resource.resource.zjzt.ysd')" :value="5" />
+              <el-option :label="$t('page.business.resource.resource.zjzt.dgd')" :value="7" />
+              <el-option :label="$t('page.business.resource.resource.zjzt.gd')" :value="9" />
+              <el-option :label="$t('page.business.resource.resource.zjzt.djd')" :value="11" />
+            </el-select>
+          </el-form-item>
+          <!-- 失效日期 -->
+          <el-form-item :label="$t('page.business.resource.gyzj.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" >
+          <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.bh')" align="center" prop="bh"
+            :show-overflow-tooltip="true" />
+          <el-table-column :label="$t('page.business.resource.gyzj.nd')" align="center">
+            <template slot-scope="scope">
+              {{ scope.row.nd }}{{ scope.row.nddw }}
+            </template>
+          </el-table-column>
+          <el-table-column :label="$t('page.business.resource.gyzj.kcl')" align="center">
+            <template slot-scope="scope">
+              {{ scope.row.kc }}{{ scope.row.kcdw }}
+            </template>
+          </el-table-column>
+          <el-table-column :label="$t('page.business.resource.gyzj.sxrq')" align="center" prop="sxrq" width="150px" />
+          <el-table-column :label="$t('page.business.resource.gyzj.zjzt')" align="center" width="100px" fixed="right">
+            <template slot-scope="scope">
+              <span v-if="scope.row.zjzt == 1">{{ $t('page.business.resource.resource.zjzt.rk') }}</span>
+              <span v-if="scope.row.zjzt == 3">{{ $t('page.business.resource.resource.zjzt.yff') }}</span>
+              <span v-if="scope.row.zjzt == 5">{{ $t('page.business.resource.resource.zjzt.ysd') }}</span>
+              <span v-if="scope.row.zjzt == 7">{{ $t('page.business.resource.resource.zjzt.dgd') }}</span>
+              <span v-if="scope.row.zjzt == 9">{{ $t('page.business.resource.resource.zjzt.gd') }}</span>
+              <span v-if="scope.row.zjzt == 11">{{ $t('page.business.resource.resource.zjzt.djd') }}</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">
+              <template v-if="scope.row.zjzt == 1 || scope.row.zjzt == 3 || scope.row.zjzt == 5 || scope.row.zjzt == 9">
+                <!-- 详情 -->
+                <el-button type="text" @click="handleXq(scope.row)" v-hasPermi="['business:resource:gyzj:xq']">{{
+                  $t('page.business.resource.gyzj.detail') }}</el-button>
+              </template>
+              <template v-if="scope.row.zjzt == 1">
+                <!-- 处置药剂 -->
+                <el-button type="text" @click="handleCzyj(scope.row)" v-hasPermi="['business:resource:gyzj:czyj']">{{
+                  $t('page.business.resource.gyzj.czyj') }}</el-button>
+                <!-- 编辑 -->
+                <el-button v-if="scope.row.bjzt == 1" type="text" @click="handleBj(scope.row)"
+                  v-hasPermi="['business:resource:gyzj:bj']">{{
+                    $t('form.edit') }}</el-button>
+                <!-- 修改库存 -->
+                <el-button v-if="scope.row.kcbjzt == 1" type="text" @click="handleXgkc(scope.row)"
+                  v-hasPermi="['business:resource:gyzj:xgkc']">{{
+                    $t('page.business.resource.gyzj.xgkc') }}</el-button>
+              <template v-if="scope.row.zjzt == 3&&scope.row.ghzt == 3">
+                <!-- 归还 -->
+                <el-button type="text" @click="handleGh(scope.row)" v-hasPermi="['business:resource:gyzj:gh']">{{
+                  $t('page.business.resource.gyzj.guihuan') }}</el-button>
+              </template>
+              </template>
+            </template>
+          </el-table-column>
+        </el-table>
+
+        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
+          :limit.sync="queryParams.pageSize" @pagination="getList" />
+      </div>
+      <!-- 编辑 -->
+      <Bj key="Bj" ref="Bj" @callback="handleQuery" />
+      <!-- 修改库存 -->
+      <Xgkc key="Xgkc" ref="Xgkc" @callback="handleQuery" />
+      <!-- 归还 -->
+      <Gh key="Gh" ref="Gh" @callback="handleQuery" />
+      <!-- 处置药剂 -->
+      <Czyj key="Czyj" ref="Czyj" @callback="handleQuery" />
+      <!-- 详情 -->
+      <Xq v-show="showDetail" key="Xq" ref="Xq" @callback="closeXq" />
+    </div>
+  </div>
+</template>
+
+<script>
+import { studyList } from "@/api/business/gyzj/gyzj"
+import Xq from "@/views/business/resource/gyzj/comps/gyzj/Xq";
+import Bj from "@/views/business/resource/gyzj/comps/gyzj/Bj";
+import Xgkc from "@/views/business/resource/gyzj/comps/gyzj/Xgkc";
+import Gh from "@/views/business/resource/gyzj/comps/gyzj/Gh";
+import Czyj from "@/views/business/resource/gyzj/comps/gyzj/Czyj";
+import moment from "moment";
+
+export default {
+  name: "GyzjList",
+  components: { Xq, Bj, Xgkc, Gh, Czyj },
+  data() {
+    return {
+      daterange: [],
+      loading: true,
+      single: true,
+      multiple: true,
+      showDetail:false,
+      total: 0,
+      list: [],
+      //勾选列表
+      selectList: [],
+      //查询条件
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        studyId: null,
+        mc: null,
+        jyzt: null,
+        zjzt: null,
+        bh: null,
+        startDate: null,
+        endDate: null,
+      },
+    }
+  },
+  created() {
+  },
+  props: {
+    study: {
+      type: Object,
+      default: () => {
+        return {}
+      }
+    }
+  },
+  watch: {
+    study: {
+      handler(newVal) {
+        this.queryParams.studyId = newVal.id
+        this.handleQuery()
+      },
+      immediate: true,
+      deep: true
+    }
+  },
+  methods: {
+    //处置药剂
+    handleCzyj(row) {
+      this.$refs.Czyj.show(row)
+    },
+    //编辑
+    handleBj(row) {
+      this.$refs.Bj.show(row)
+    },
+    //修改库存
+    handleXgkc(row) {
+      this.$refs.Xgkc.show(row)
+    },
+    //归还
+    handleGh(row) {
+      this.$refs.Gh.show(row)
+    },
+    closeXq(){
+      this.showDetail=false
+      this.handleQuery()
+      this.$emit('showDetail',this.showDetail)
+    },
+    //详情
+    handleXq(row) {
+      this.showDetail=true
+      this.$emit('showDetail',this.showDetail)
+      this.$refs.Xq.show(row)
+    },
+    //获取列表
+    getList() {
+      if (this.daterange != null && this.daterange.length > 0) {
+        this.queryParams.startDate = this.daterange[0]
+        this.queryParams.endDate = moment().add(this.daterange[1], 'days').format('YYYY-MM-DD');
+      } else {
+        this.queryParams.startDate = ''
+        this.queryParams.endDate = ''
+      }
+      this.loading = true
+      studyList(this.queryParams).then(response => {
+        this.list = response.rows
+        this.total = response.total
+        this.loading = false
+      })
+    },
+    //查询
+    handleQuery() {
+      this.queryParams.pageNum = 1
+      this.getList()
+    },
+    //重置
+    resetQuery() {
+      this.resetForm("queryForm")
+      this.handleQuery()
+    },
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss">
+.gyzj {
+  background: #fff;
+  padding: 10px 10px;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/business/study/comp/wzlb/mjyList.vue b/src/views/business/study/comp/wzlb/mjyList.vue
new file mode 100644
index 0000000..3b0da65
--- /dev/null
+++ b/src/views/business/study/comp/wzlb/mjyList.vue
@@ -0,0 +1,233 @@
+<template>
+  <div>
+    <!-- 列表 -->
+    <div>
+      <div class="mjy" v-show="!showDetail">
+        <el-form :model="queryParams" ref="queryForm" class="search-area" :inline="true" label-width="88px">
+          <!-- 名称 -->
+          <el-form-item :label="$t('page.business.resource.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.resource.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.resource.mjy.zjzt') + '：'">
+            <el-select v-model="queryParams.zjzt" :placeholder="$t('form.placeholderSelect')" clearable
+              @change="handleQuery">
+              <el-option :label="$t('page.business.resource.resource.zjzt.rk')" :value="1" />
+              <el-option :label="$t('page.business.resource.resource.zjzt.yff')" :value="3" />
+              <el-option :label="$t('page.business.resource.resource.zjzt.ysd')" :value="5" />
+              <el-option :label="$t('page.business.resource.resource.zjzt.dgd')" :value="7" />
+              <el-option :label="$t('page.business.resource.resource.zjzt.gd')" :value="9" />
+              <el-option :label="$t('page.business.resource.resource.zjzt.djd')" :value="11" />
+            </el-select>
+          </el-form-item>
+          <!-- 失效日期 -->
+          <el-form-item :label="$t('page.business.resource.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">
+          <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.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.resource.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.resource.mjy.sxrq')" align="center" prop="sxrq" width="150px" />
+          <el-table-column :label="$t('page.business.resource.mjy.zjzt')" align="center" width="100px" fixed="right">
+            <template slot-scope="scope">
+              <span v-if="scope.row.zjzt == 1">{{ $t('page.business.resource.resource.zjzt.rk') }}</span>
+              <span v-if="scope.row.zjzt == 3">{{ $t('page.business.resource.resource.zjzt.yff') }}</span>
+              <span v-if="scope.row.zjzt == 5">{{ $t('page.business.resource.resource.zjzt.ysd') }}</span>
+              <span v-if="scope.row.zjzt == 7">{{ $t('page.business.resource.resource.zjzt.dgd') }}</span>
+              <span v-if="scope.row.zjzt == 9">{{ $t('page.business.resource.resource.zjzt.gd') }}</span>
+              <span v-if="scope.row.zjzt == 11">{{ $t('page.business.resource.resource.zjzt.djd') }}</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">
+              <template v-if="scope.row.zjzt == 1 || scope.row.zjzt == 3 || scope.row.zjzt == 5 || scope.row.zjzt == 9">
+                <!-- 详情 -->
+                <el-button type="text" @click="handleXq(scope.row)" v-hasPermi="['business:resource:mjy:xq']">{{
+                  $t('page.business.resource.mjy.detail') }}</el-button>
+              </template>
+              <template v-if="scope.row.zjzt == 1">
+                <!-- 处置药剂 -->
+                <el-button type="text" @click="handleCzyj(scope.row)" v-hasPermi="['business:resource:mjy:czyj']">{{
+                  $t('page.business.resource.mjy.czyj') }}</el-button>
+                <!-- 编辑 -->
+                <el-button v-if="scope.row.bjzt == 1" type="text" @click="handleBj(scope.row)"
+                  v-hasPermi="['business:resource:mjy:bj']">{{
+                    $t('form.edit') }}</el-button>
+                <!-- 修改库存 -->
+                <el-button v-if="scope.row.kcbjzt == 1" type="text" @click="handleXgkc(scope.row)"
+                  v-hasPermi="['business:resource:mjy:xgkc']">{{
+                    $t('page.business.resource.mjy.xgkc') }}</el-button>
+              </template>
+              <template v-if="scope.row.zjzt == 3">
+                <!-- 归还 -->
+                <el-button type="text" @click="handleGh(scope.row)" v-hasPermi="['business:resource:mjy:gh']">{{
+                  $t('page.business.resource.mjy.guihuan') }}</el-button>
+              </template>
+            </template>
+          </el-table-column>
+        </el-table>
+
+        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
+          :limit.sync="queryParams.pageSize" @pagination="getList" />
+      </div>
+      <!-- 编辑 -->
+      <Bj key="Bj" ref="Bj" @callback="handleQuery" />
+      <!-- 修改库存 -->
+      <Xgkc key="Xgkc" ref="Xgkc" @callback="handleQuery" />
+      <!-- 处置药剂 -->
+      <Czyj key="Czyj" ref="Czyj" @callback="handleQuery" />
+      <!-- 详情 -->
+      <Xq v-show="showDetail" key="Xq" ref="Xq" @callback="closeXq" />
+    </div>
+  </div>
+</template>
+
+<script>
+import { studyList } from "@/api/business/mjy/mjy"
+import Xq from "@/views/business/resource/mjy/comps/mjy/Xq";
+import Bj from "@/views/business/resource/mjy/comps/mjy/Bj";
+import Xgkc from "@/views/business/resource/mjy/comps/mjy/Xgkc";
+import Gh from "@/views/business/resource/mjy/comps/mjy/Gh";
+import Czyj from "@/views/business/resource/mjy/comps/mjy/Czyj";
+import moment from "moment";
+
+export default {
+  name: "MjyList",
+  components: { Xq, Bj, Xgkc, Czyj, Gh },
+  data() {
+    return {
+      daterange: [],
+      loading: true,
+      single: true,
+      multiple: true,
+      showDetail: false,
+      total: 0,
+      list: [],
+      //勾选列表
+      selectList: [],
+      //查询条件
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        mc: null,
+        jyzt: null,
+        studyId: null,
+        zjzt: null,
+        bh: null,
+        startDate: null,
+        endDate: null,
+      },
+    }
+  },
+  created() {
+  },
+  props: {
+    study: {
+      type: Object,
+      default: () => {
+        return {}
+      }
+    }
+  },
+  watch: {
+    study: {
+      handler(newVal) {
+        this.queryParams.studyId = newVal.id
+        this.handleQuery()
+      },
+      immediate: true,
+      deep: true
+    }
+  },
+  methods: {
+    //处置药剂
+    handleCzyj(row) {
+      this.$refs.Czyj.show(row)
+    },
+    //编辑
+    handleBj(row) {
+      this.$refs.Bj.show(row)
+    },
+    //修改库存
+    handleXgkc(row) {
+      this.$refs.Xgkc.show(row)
+    },
+    //归还
+    handleGh(row) {
+      this.$refs.Gh.show(row)
+    },
+    closeXq() {
+      this.showDetail = false
+      this.$emit('showDetail', this.showDetail)
+      this.handleQuery()
+    },
+    //详情
+    handleXq(row) {
+      this.showDetail = true
+      this.$emit('showDetail', this.showDetail)
+      this.$refs.Xq.show(row)
+    },
+    //获取列表
+    getList() {
+      if (this.daterange != null && this.daterange.length > 0) {
+        this.queryParams.startDate = this.daterange[0]
+        this.queryParams.endDate = moment().add(this.daterange[1], 'days').format('YYYY-MM-DD');
+      } else {
+        this.queryParams.startDate = ''
+        this.queryParams.endDate = ''
+      }
+      this.loading = true
+      studyList(this.queryParams).then(response => {
+        this.list = response.rows
+        this.total = response.total
+        this.loading = false
+      })
+    },
+    //查询
+    handleQuery() {
+      this.queryParams.pageNum = 1
+      this.getList()
+    },
+    //重置
+    resetQuery() {
+      this.resetForm("queryForm")
+      this.handleQuery()
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss">
+.mjy {
+  background: #fff;
+  padding: 10px 10px;
+}
+</style>
\ No newline at end of file