diff --git a/src/api/business/sj/sj.js b/src/api/business/sj/sj.js
index f90f36c..d134100 100644
--- a/src/api/business/sj/sj.js
+++ b/src/api/business/sj/sj.js
@@ -156,7 +156,7 @@ export function tzList(query) {
 // 分装
 export function sj_subpackage(data) {
   return request({
-    url: '/system/business/sj/subpackage',
+    url: '/system/business/studyFormFill/subpackage',
     method: 'post',
     data: data
   })
@@ -164,7 +164,7 @@ export function sj_subpackage(data) {
 // 开始配置
 export function sj_startConfiguration(data) {
   return request({
-    url: '/system/business/sj/startConfiguration',
+    url: '/system/business/studyFormFill/startConfiguration',
     method: 'post',
     data: data
   })
@@ -172,7 +172,7 @@ export function sj_startConfiguration(data) {
 // 完成配置
 export function sj_configurationCompleted(data) {
   return request({
-    url: '/system/business/sj/configurationCompleted',
+    url: '/system/business/studyFormFill/configurationCompleted',
     method: 'post',
     data: data
   })
diff --git a/src/views/business/form/drug/comp/wzlb.vue b/src/views/business/form/drug/comp/wzlb.vue
index d79627a..27b4197 100644
--- a/src/views/business/form/drug/comp/wzlb.vue
+++ b/src/views/business/form/drug/comp/wzlb.vue
@@ -38,6 +38,8 @@
         </div>
       </div>
        <div class="content-box" v-if="studyInfo.id&&studyInfo.id!=''">
+         <sjList v-if="active === 'sjlb'" :study="studyInfo" @showDetail="showDetailCallback" />
+        <gspList v-if="active === 'gsplb'" :study="studyInfo" @showDetail="showDetailCallback" />
         <gyzjList v-if="active === 'gyzjlb'" :study="studyInfo" @showDetail="showDetailCallback" />
         <mjyList v-if="active === 'mjylb'" :study="studyInfo" @showDetail="showDetailCallback"/>
       </div>
@@ -51,6 +53,8 @@ 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'
+import sjList from '@/views/business/study/comp/wzlb/sjList.vue'
+import gspList from '@/views/business/study/comp/wzlb/gspList.vue'
 export default {
   name: 'StudyWzlb',
   props: {
@@ -70,7 +74,7 @@ export default {
       }
     },
   },
-  components: {gyzjList,mjyList},
+  components: {gyzjList,mjyList,sjList,gspList},
   data() {
     return {
       showDetail: false,
diff --git a/src/views/business/study/comp/tbbd/Bj.vue b/src/views/business/study/comp/tbbd/Bj.vue
index cd40aef..e229e3d 100644
--- a/src/views/business/study/comp/tbbd/Bj.vue
+++ b/src/views/business/study/comp/tbbd/Bj.vue
@@ -800,20 +800,20 @@ export default {
             this.$modal.msgError("请选择要处置的药剂")
           } else {
              for (var i = 0; i < that.cclistYj.length; i++) {
-              if (!that.cclistYj[i].ccwz||that.cclistYj[i].ccwz=='') {
-                this.$modal.msgError('第'+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) + "个存储,存储条件不能为空")
                 return
               }
-            //  if (!that.cclistYj[i].cctj||that.cclistYj[i].cctj=='') {
-            //     this.$modal.msgError('第'+i + "个存储,存储条件不能为空")
-            //     return
-            //   }
             }
             that.$modal.loading()
             that.formYjcc.resource = JSON.stringify(that.resource)
-            that.formApprove.cclist = JSON.stringify(that.cclistYj)
-            studyFormFill_yjcc(that.formApprove).then(response => {
-              that.openApprove = false
+            that.formYjcc.cclist = JSON.stringify(that.cclistYj)
+            studyFormFill_yjcc(that.formYjcc).then(response => {
+              that.openYjcc = false
               that.$modal.closeLoading()
               that.cancelSave()
             }).finally(() => {