diff --git a/src/api/business/study/studyFormFill.js b/src/api/business/study/studyFormFill.js
index 5c34342..df926ef 100644
--- a/src/api/business/study/studyFormFill.js
+++ b/src/api/business/study/studyFormFill.js
@@ -191,4 +191,12 @@ export function studyFormFill_updateBdnr(data) {
     method: 'post',
     data: data
   })
-}
\ No newline at end of file
+}
+
+export function studyFormFill_yjccFilter(data) {
+  return request({
+    url: '/system/business/studyFormFill/yjccFilter',
+    method: 'post',
+    data: data
+  })
+}
diff --git a/src/views/business/study/comp/tbbd/Bj.vue b/src/views/business/study/comp/tbbd/Bj.vue
index e229e3d..dd39ce7 100644
--- a/src/views/business/study/comp/tbbd/Bj.vue
+++ b/src/views/business/study/comp/tbbd/Bj.vue
@@ -30,7 +30,7 @@
           <template v-else>
             <el-button @click="showYjcc" v-if="form.templateShowYjcc == 10">{{
               $t('page.business.study.studyFormFill.yjcc')
-              }}</el-button>
+            }}</el-button>
             <el-button @click="showSave">{{ $t('page.business.study.studyFormFill.save') }}</el-button>
             <el-button type="primary" @click="showApprove">{{ $t('page.business.study.studyFormFill.submit')
             }}</el-button>
@@ -365,7 +365,7 @@
 </template>
 
 <script>
-import { studyFormFill_bc, studyFormFill_yjcc, studyFormFill_bcOnly, studyFormFill_updateBdnr, studyFormFill_tj, studyFormFill_info, studyFormFill_updateFhyjjl } from "@/api/business/study/studyFormFill"
+import { studyFormFill_bc,studyFormFill_yjccFilter, studyFormFill_yjcc, studyFormFill_bcOnly, studyFormFill_updateBdnr, studyFormFill_tj, studyFormFill_info, studyFormFill_updateFhyjjl } from "@/api/business/study/studyFormFill"
 import { study_info } from "@/api/business/study/study"
 import { mapGetters } from 'vuex'
 import SelectTemplate from "@/views/business/comps/select/SelectTemplate";
@@ -649,10 +649,22 @@ export default {
       if (content) {
         that.resetYjcc()
         that.formYjcc.id = that.form.id
-        this.cclistYj = []
+        that.cclistYj = []
         that.addCcYj()
-        that.resourceYj = that.$refs.templateTable.getResource()
-        that.openYjcc = true
+        let tmp = _.filter(tmp, function (o) {
+          return o.type == null || o.type == 3 || o.type == 5 || o.type == 7
+        })
+        if (tmp.length > 0) {
+          that.$modal.loading()
+          studyFormFill_yjccFilter({ id: this.form.id, resource: tmp }).then(response => {
+            that.resourceYj = JSON.parse(response.data)
+            that.openYjcc = true
+          }).finally(() => {
+            that.$modal.closeLoading()
+          })
+        }else{
+            that.$modal.msgError("没有可存储的药剂")
+        }
       }
     },
     resetYjcc() {
@@ -799,13 +811,13 @@ export default {
           if (that.cclistYj.length == 0) {
             this.$modal.msgError("请选择要处置的药剂")
           } else {
-             for (var i = 0; i < that.cclistYj.length; i++) {
+            for (var i = 0; i < that.cclistYj.length; i++) {
               // if (!that.cclistYj[i].ccwz||that.cclistYj[i].ccwz=='') {
               //   this.$modal.msgError('第'+(i+1) + "个存储,存储位置不能为空")
               //   return
               // }
-             if (!that.cclistYj[i].cctj||that.cclistYj[i].cctj=='') {
-                this.$modal.msgError('第'+(i+1) + "个存储,存储条件不能为空")
+              if (!that.cclistYj[i].cctj || that.cclistYj[i].cctj == '') {
+                this.$modal.msgError('第' + (i + 1) + "个存储,存储条件不能为空")
                 return
               }
             }
diff --git a/src/views/business/study/comp/wzlb/gyzjList.vue b/src/views/business/study/comp/wzlb/gyzjList.vue
index 6469a09..a69fa9b 100644
--- a/src/views/business/study/comp/wzlb/gyzjList.vue
+++ b/src/views/business/study/comp/wzlb/gyzjList.vue
@@ -19,6 +19,7 @@
             <el-select v-model="queryParams.zjzt" :placeholder="$t('form.placeholderSelect')" clearable
               >
               <el-option :label="$t('page.business.resource.resource.zjzt.rk')" :value="1" />
+              <el-option :label="$t('page.business.resource.resource.zjzt.wrk')" :value="2" />
               <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" />