diff --git a/src/lang/en.js b/src/lang/en.js
index 4abd805..61ebf07 100644
--- a/src/lang/en.js
+++ b/src/lang/en.js
@@ -27,7 +27,8 @@ import studyFormFill from './en/business/study/studyFormFill'
 import studyFormPlan from './en/business/study/studyFormPlan'
 //申请表单
 import studyFormApply from './en/business/study/studyFormApply'
-
+// 饲养间
+import studyRoom from './en/business/study/studyRoom'
 //表单
 import form from './en/business/form/form'
 
@@ -144,7 +145,7 @@ export default {
         studyFormFill: studyFormFill,
         studyFormPlan: studyFormPlan,
         studyFormApply: studyFormApply,
-
+        studyRoom: studyRoom,
         nonTrial: nonTrial,
         drug: drug
       },
diff --git a/src/lang/en/business/study/studyRoom.js b/src/lang/en/business/study/studyRoom.js
new file mode 100644
index 0000000..6e93ae1
--- /dev/null
+++ b/src/lang/en/business/study/studyRoom.js
@@ -0,0 +1,4 @@
+export default {
+    qysyj: '启用饲养间',
+    xzqy: '新增启用',
+}
\ No newline at end of file
diff --git a/src/lang/zh.js b/src/lang/zh.js
index c70a6a8..b35cdd1 100644
--- a/src/lang/zh.js
+++ b/src/lang/zh.js
@@ -27,6 +27,8 @@ import studyFormFill from './zh/business/study/studyFormFill'
 import studyFormPlan from './zh/business/study/studyFormPlan'
 //申请表单
 import studyFormApply from './zh/business/study/studyFormApply'
+//饲养间
+import studyRoom from './zh/business/study/studyRoom'
 
 //表单
 import form from './zh/business/form/form'
@@ -140,7 +142,7 @@ export default {
         studyFormFill: studyFormFill,
         studyFormPlan: studyFormPlan,
         studyFormApply: studyFormApply,
-
+        studyRoom: studyRoom,
         nonTrial: nonTrial,
         drug: drug
       },
diff --git a/src/lang/zh/business/study/studyRoom.js b/src/lang/zh/business/study/studyRoom.js
new file mode 100644
index 0000000..6e93ae1
--- /dev/null
+++ b/src/lang/zh/business/study/studyRoom.js
@@ -0,0 +1,4 @@
+export default {
+    qysyj: '启用饲养间',
+    xzqy: '新增启用',
+}
\ No newline at end of file
diff --git a/src/views/business/study/comp/syj/Xz.vue b/src/views/business/study/comp/syj/Xz.vue
new file mode 100644
index 0000000..acac398
--- /dev/null
+++ b/src/views/business/study/comp/syj/Xz.vue
@@ -0,0 +1,234 @@
+G<template>
+  <div>
+    <!-- 新增试验间弹窗 -->
+    <el-dialog :title="$t('page.business.study.studyRoom.xzsyj')" :visible.sync="open" width="800px" append-to-body :close-on-click-modal="false">
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+        <el-row>
+          <!-- 名称 -->
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.resource.gsp.mc')" prop="mc">
+              <el-input type="text" v-model="form.mc" maxlength="50" :placeholder="$t('form.placeholderInput')" />
+            </el-form-item>
+          </el-col>
+          <!-- 编号 -->
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.resource.gsp.bh')" prop="bh">
+              <el-input type="text" v-model="form.bh" maxlength="50" :placeholder="$t('form.placeholderInput')" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <!-- 批号 -->
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.resource.gsp.ph')" prop="ph">
+              <el-input type="text" v-model="form.ph" maxlength="50" :placeholder="$t('form.placeholderInput')" />
+            </el-form-item>
+          </el-col>
+          <!-- 规格 -->
+          <el-col :span="8">
+            <el-form-item :label="$t('page.business.resource.gsp.gg')" prop="gg">
+              <el-input type="text" v-model="form.gg" maxlength="50" :placeholder="$t('form.placeholderInput')" />
+            </el-form-item>
+          </el-col>
+          <!-- 规格单位 -->
+          <el-col :span="4">
+            <BusinessSelect v-model="form.ggdw"
+              dictType="system_business_nddw,system_business_zldw,system_business_tjdw"></BusinessSelect>
+          </el-col>
+        </el-row>
+        <el-row>
+          <!-- 库存量 -->
+          <el-col :span="8">
+            <el-form-item :label="$t('page.business.resource.gsp.kcl')" prop="kc">
+              <el-input type="number" v-model="form.kc" maxlength="50" :placeholder="$t('form.placeholderInput')" />
+            </el-form-item>
+          </el-col>
+          <!-- 库存量单位 -->
+          <el-col :span="4">
+            <BusinessSelect v-model="form.kcdw"
+              dictType="system_business_nddw,system_business_zldw,system_business_tjdw"></BusinessSelect>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.resource.gsp.yxq')" prop="yxq">
+              <el-date-picker v-model="form.yxq" type="datetime" format="yyyy-MM-dd HH:mm"
+                value-format="yyyy-MM-dd HH:mm:ss" :placeholder="$t('form.placeholderInput')">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <!-- 存储条件 -->
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.resource.gsp.cctj')" prop="cctj">
+              <BusinessSelect v-model="form.cctj" dictType="system_business_cctj"></BusinessSelect>
+            </el-form-item>
+          </el-col>
+          <!-- 接收日期 -->
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.resource.gsp.jsrq')" prop="jsrq">
+              <el-date-picker v-model="form.jsrq" type="datetime" format="yyyy-MM-dd HH:mm"
+                value-format="yyyy-MM-dd HH:mm:ss" :placeholder="$t('form.placeholderInput')">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <!-- 注意事项 -->
+          <el-col :span="24">
+            <el-form-item :label="$t('page.business.resource.gsp.zysx')" prop="zysx">
+              <el-input type="textarea" :rows="2" v-model="form.zysx" maxlength="500"
+                :placeholder="$t('form.placeholderInput')" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <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-col :span="12">
+            <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.signerPsw')" prop="qmrmm">
+              <el-input type="password" v-model="form.qmrmm" maxlength="20"
+                :placeholder="$t('form.placeholderInput')" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item :label="$t('form.qmbz')" prop="qmbz">
+              <el-input type="textarea" v-model="form.qmbz" :rows="2" maxlength="500"
+                :placeholder="$t('form.placeholderInput')">
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="save">{{ $t('form.confirm') }}</el-button>
+        <el-button @click="cancel">{{ $t('form.cancel') }}</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { save } from "@/api/business/gsp/gsp"
+import { mapGetters } from 'vuex'
+import BusinessSelect from '@/views/business/comps/select/BusinessSelect';
+
+export default {
+  name: "XzSyj",
+  components: { BusinessSelect },
+  data() {
+    return {
+      open: false,
+      form: {},
+      rules: {
+        mc: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        bh: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        ph: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        gg: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        kc: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        yxq: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        jsrq: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        cctj: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        zysx: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        qmrmm: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+      }
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'nickName'
+    ]),
+  },
+  created() {
+  },
+  methods: {
+    cancel() {
+      this.open = false
+    },
+    reset() {
+      this.form = {
+        id: null,
+        mc: null,
+        bh: null,
+        nd: null,
+        nddw: null,
+        sxrq: null,
+        cctj: null,
+        ccwz: null,
+        qmrmm: null,
+        qmyy: '新增供试品',
+        bjbz: ''
+      }
+      this.resetForm("form")
+    },
+    show() {
+      this.reset()
+
+      this.open = true
+    },
+    save() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          save(this.form).then(response => {
+            this.open = false
+            this.$emit('callback')
+          })
+        }
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/business/study/comp/syjList.vue b/src/views/business/study/comp/syjList.vue
index 4556fa9..71bb937 100644
--- a/src/views/business/study/comp/syjList.vue
+++ b/src/views/business/study/comp/syjList.vue
@@ -3,75 +3,35 @@
   <div>
     <div class="tbbd-list" v-show="!showDetail && !showEdit && !showAudit && !showFh">
       <div class="tbbd-search">
-        <el-form :model="searchForm" ref="searchForm" :inline="true" label-width="100px">
+        <el-form :model="searchForm" ref="searchForm" class="search-area" :inline="true" label-width="88px">
           <el-row>
-            <el-col :span="6">
+            <el-col :span="24">
               <el-form-item :label="$t('page.business.form.bdmc')" prop="name">
                 <el-input v-model="searchForm.bdmc" :placeholder="$t('form.placeholderInput')" clearable
-                  style="width: 200px" @keyup.enter.native="search" />
+                   @keyup.enter.native="search" />
               </el-form-item>
-            </el-col>
-            <el-col :span="6">
               <el-form-item :label="$t('page.business.form.bdbh')" prop="sn">
                 <el-input v-model="searchForm.bdbh" :placeholder="$t('form.placeholderInput')" clearable
-                  style="width: 200px" @keyup.enter.native="search" />
+                   @keyup.enter.native="search" />
               </el-form-item>
-            </el-col>
-            <el-col :span="6">
               <el-form-item :label="$t('page.business.form.gsr')" prop="userId">
-                <SelectDeptUser v-model="searchForm.userId" style="width: 200px" :name="searchForm.userMc" key="userId"
+                <SelectDeptUser v-model="searchForm.userId"  :name="searchForm.userMc" key="userId"
                   @change="userChange" />
               </el-form-item>
-            </el-col>
-            <el-col :span="6">
               <el-form-item>
-                <div style="margin-left: 100px;">
-                  <el-button type="primary" icon="el-icon-search" @click="search">{{ $t('form.search') }}</el-button>
-                  <el-button icon="el-icon-refresh" @click="reset">{{ $t('form.reset') }}</el-button>
-                </div>
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="6">
-              <el-form-item :label="$t('page.business.form.xtmbmc')" prop="templateName">
-                <el-input v-model="searchForm.templateMc" :placeholder="$t('form.placeholderInput')" clearable
-                  style="width: 200px" @keyup.enter.native="search" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item :label="$t('page.business.form.cjsj')">
-                <el-date-picker v-model="daterange" clearable type="daterange" range-separator="-"
-                  :start-placeholder="$t('page.business.form.startDate')"
-                  :end-placeholder="$t('page.business.form.endDate')" value-format="yyyy-MM-dd" @change="search"
-                  style="width: 200px" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item :label="$t('page.business.form.tjsj')">
-                <el-date-picker v-model="daterangetj" clearable type="daterange" range-separator="-"
-                  :start-placeholder="$t('page.business.form.startDate')"
-                  :end-placeholder="$t('page.business.form.endDate')" value-format="yyyy-MM-dd" @change="search"
-                  style="width: 200px" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item :label="$t('page.business.study.studyFormFill.sfbl')">
-                <el-select v-model="searchForm.sfbl" :placeholder="$t('form.placeholderSelect')" clearable
-                  @change="search">
-                  <el-option :label="$t('page.business.study.studyFormFill.yes')" :value="10" />
-                  <el-option :label="$t('page.business.study.studyFormFill.no')" :value="1" />
-                </el-select>
+                <el-button type="primary" icon="el-icon-search" @click="search">{{ $t('form.search') }}</el-button>
+                <el-button icon="el-icon-refresh" @click="reset">{{ $t('form.reset') }}</el-button>
               </el-form-item>
             </el-col>
           </el-row>
         </el-form>
+
       </div>
       <div class="tbbd-content">
         <el-row class="add-box">
           <el-col>
             <el-button type="primary" icon="el-icon-plus" @click="add()" v-hasPermi="['business:studyFormFill:xz']">{{
-              $t('page.business.study.studyFormFill.xzbd') }}</el-button>
+              $t('page.business.study.studyRoom.xzqy') }}</el-button>
           </el-col>
         </el-row>