From a02af3bda4c3d6b762989cbb7ee1e01c689bb372 Mon Sep 17 00:00:00 2001
From: "15881625488@163.com" <15881625488@163.com>
Date: Fri, 6 Feb 2026 17:25:01 +0800
Subject: [PATCH] =?UTF-8?q?fix:[=E6=A8=A1=E6=9D=BF=E7=AE=A1=E7=90=86]?=
 =?UTF-8?q?=E8=8D=AF=E5=89=82=E5=AD=98=E5=82=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/business/study/comp/tbbd/Bj.vue | 53 ++++++++++++++++++++++---------
 1 file changed, 38 insertions(+), 15 deletions(-)

diff --git a/src/views/business/study/comp/tbbd/Bj.vue b/src/views/business/study/comp/tbbd/Bj.vue
index 1b7a9c0..cd40aef 100644
--- a/src/views/business/study/comp/tbbd/Bj.vue
+++ b/src/views/business/study/comp/tbbd/Bj.vue
@@ -28,8 +28,9 @@
             <el-button type="primary" @click="next">{{ $t('page.business.study.studyFormFill.next') }}</el-button>
           </template>
           <template v-else>
-            <el-button @click="showYjcc" v-if="form.templateShowYjcc==10">{{ $t('page.business.study.studyFormFill.yjcc')
-            }}</el-button>
+            <el-button @click="showYjcc" v-if="form.templateShowYjcc == 10">{{
+              $t('page.business.study.studyFormFill.yjcc')
+              }}</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>
@@ -44,7 +45,8 @@
               <el-col :span="24">
                 <el-form-item :label="bdmbTitle" prop="templateId">
                   <SelectTemplate v-model="form.templateId" :disabled="form.id && form.id !== ''"
-                    :name="form.templateMc" :studyType="studyType" :studyFormType="studyFormType" @change="selectTemplateChange" :needPre="1" />
+                    :name="form.templateMc" :studyType="studyType" :studyFormType="studyFormType"
+                    @change="selectTemplateChange" :needPre="1" />
                 </el-form-item>
               </el-col>
             </el-row>
@@ -363,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_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";
@@ -451,6 +453,13 @@ export default {
           trigger: 'blur'
         }]
       },
+      rulesYjcc: {
+        qmrmm: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }]
+      },
       rulesSave: {
         qmrmm: [{
           required: true,
@@ -460,7 +469,7 @@ export default {
       },
       templateData: {},
       studyType: null,
-      studyFormType:null
+      studyFormType: null
     }
   },
   computed: {
@@ -787,16 +796,30 @@ export default {
       let that = this
       this.$refs["formYjcc"].validate(valid => {
         if (valid) {
-          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.$modal.closeLoading()
-            that.cancelSave()
-          }).finally(() => {
-            that.$modal.closeLoading()
-          })
+          if (that.cclistYj.length == 0) {
+            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 + "个存储,存储位置不能为空")
+                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.$modal.closeLoading()
+              that.cancelSave()
+            }).finally(() => {
+              that.$modal.closeLoading()
+            })
+          }
         }
       })
     },