diff --git a/src/views/business/form/drug/comp/wzlb.vue b/src/views/business/form/drug/comp/wzlb.vue
index 94b8029..e462b57 100644
--- a/src/views/business/form/drug/comp/wzlb.vue
+++ b/src/views/business/form/drug/comp/wzlb.vue
@@ -1,10 +1,56 @@
 <template>
   <div class="study-syxx">
-    物资列表
+    <div class="syxx-top" v-show="!showDetail" style="margin-bottom: 10px;">
+      <div class="syxx-operate">
+        <div class="operate-img"></div>
+        <div class="operate-left">{{ $t('page.business.study.studyFormPlan.syxx') }}</div>
+      </div>
+      <el-form ref="form" label-width="90px">
+        <el-row>
+          <el-col :span="6">
+            <el-form-item :label="$t('page.business.study.studyFormPlan.symc')">
+              {{ studyInfo.name }}
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item :label="$t('page.business.study.studyFormPlan.sybh')">
+              {{ studyInfo.sn }}
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item :label="$t('page.business.study.studyFormPlan.syfzr')">
+              {{ studyInfo.leaderName }}
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item :label="$t('page.business.study.studyFormPlan.cjsj')">
+              {{ studyInfo.createTime }}
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </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>
 </template>
 
 <script>
+import { checkPermi, checkRole } from "@/utils/permission";
+import { study_info } from "@/api/business/study/study"
+import gyzjList from '@/views/business/study/comp/wzlb/gyzjList.vue'
+import mjyList from '@/views/business/study/comp/wzlb/mjyList.vue'
 export default {
   name: 'StudyWzlb',
   props: {
@@ -19,20 +65,126 @@ export default {
     study: {
       immediate: true,
       handler(v) {
+        this.studyId = v.id
+        this.getStudyInfo()
       }
     },
   },
-  components: {  },
+  components: {gyzjList,mjyList},
   data() {
     return {
+      showDetail: false,
+      studyId: '',
+      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') },
+      ],
+      active: 'sjlb',
     }
   },
   created() {
   },
   methods: {
-    
+    checkPermi,
+    checkRole,
+    getStudyInfo() {
+      this.$modal.loading()
+      study_info({ id: this.studyId }).then(response => {
+        this.studyInfo = response.data
+        this.$modal.closeLoading()
+      }).finally(() => {
+        this.$modal.closeLoading()
+      })
+    },
+    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;
+    width: 100%;
+
+    .syxx-operate {
+      margin: 0px 0 10px 0;
+      display: flex;
+      flex-direction: row;
+      align-items: center;
+      color: #409eff;
+
+      .operate-img {
+        flex-shrink: 0;
+        height: 15px;
+        background: #409eff;
+        width: 3px;
+      }
+
+      .operate-left {
+        flex-shrink: 0;
+        font-weight: bold;
+        padding-left: 10px;
+      }
+
+      .operate-right {
+        flex-grow: 1;
+        text-align: right;
+
+        .operate-icon {
+          cursor: pointer;
+        }
+      }
+    }
+  }
+
+  .syxx-content {}
+}
 </style>
diff --git a/src/views/business/form/nonTrial/comp/wzlb.vue b/src/views/business/form/nonTrial/comp/wzlb.vue
index 94b8029..d46229d 100644
--- a/src/views/business/form/nonTrial/comp/wzlb.vue
+++ b/src/views/business/form/nonTrial/comp/wzlb.vue
@@ -1,10 +1,54 @@
 <template>
   <div class="study-syxx">
-    物资列表
+    <div class="syxx-top" v-show="!showDetail" style="margin-bottom: 10px;">
+      <div class="syxx-operate">
+        <div class="operate-img"></div>
+        <div class="operate-left">{{ $t('page.business.study.studyFormPlan.syxx') }}</div>
+      </div>
+      <el-form ref="form" label-width="90px">
+        <el-row>
+          <el-col :span="6">
+            <el-form-item :label="$t('page.business.study.studyFormPlan.symc')">
+              {{ studyInfo.name }}
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item :label="$t('page.business.study.studyFormPlan.sybh')">
+              {{ studyInfo.sn }}
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item :label="$t('page.business.study.studyFormPlan.syfzr')">
+              {{ studyInfo.leaderName }}
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item :label="$t('page.business.study.studyFormPlan.cjsj')">
+              {{ studyInfo.createTime }}
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </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" />
+      </div>
+    </div>
+
   </div>
 </template>
 
 <script>
+import { checkPermi, checkRole } from "@/utils/permission";
+import { study_info } from "@/api/business/study/study"
+import gyzjList from '@/views/business/study/comp/wzlb/gyzjList.vue'
 export default {
   name: 'StudyWzlb',
   props: {
@@ -19,20 +63,127 @@ export default {
     study: {
       immediate: true,
       handler(v) {
+        this.studyId = v.id
+        this.getStudyInfo()
       }
     },
   },
-  components: {  },
+  components: {gyzjList},
   data() {
     return {
+      showDetail: false,
+      studyId: '',
+      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: 'xblb', name: this.$t('page.business.study.studyEnter.xblb') },
+        { key: 'xjlb', name: this.$t('page.business.study.studyEnter.xjlb') }
+      ],
+      active: 'sjlb',
     }
   },
   created() {
   },
   methods: {
-    
+    checkPermi,
+    checkRole,
+    getStudyInfo() {
+      this.$modal.loading()
+      study_info({ id: this.studyId }).then(response => {
+        this.studyInfo = response.data
+        this.$modal.closeLoading()
+      }).finally(() => {
+        this.$modal.closeLoading()
+      })
+    },
+    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;
+    width: 100%;
+
+    .syxx-operate {
+      margin: 0px 0 10px 0;
+      display: flex;
+      flex-direction: row;
+      align-items: center;
+      color: #409eff;
+
+      .operate-img {
+        flex-shrink: 0;
+        height: 15px;
+        background: #409eff;
+        width: 3px;
+      }
+
+      .operate-left {
+        flex-shrink: 0;
+        font-weight: bold;
+        padding-left: 10px;
+      }
+
+      .operate-right {
+        flex-grow: 1;
+        text-align: right;
+
+        .operate-icon {
+          cursor: pointer;
+        }
+      }
+    }
+  }
+
+  .syxx-content {}
+}
 </style>
diff --git a/src/views/business/study/comp/wzlb.vue b/src/views/business/study/comp/wzlb.vue
index 97da80d..457d41e 100644
--- a/src/views/business/study/comp/wzlb.vue
+++ b/src/views/business/study/comp/wzlb.vue
@@ -50,7 +50,6 @@
 import { checkPermi, checkRole } from "@/utils/permission";
 import { study_info } from "@/api/business/study/study"
 import gyzjList from './wzlb/gyzjList.vue'
-import mjyList from './wzlb/mjyList.vue'
 export default {
   name: 'StudyWzlb',
   props: {
@@ -70,7 +69,7 @@ export default {
       }
     },
   },
-  components: {gyzjList,mjyList},
+  components: {gyzjList},
   data() {
     return {
       showDetail: false,
@@ -80,7 +79,6 @@ export default {
         { 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') }
       ],