From ddf372c67911a4604660200b6b3555ac332f285a Mon Sep 17 00:00:00 2001
From: HanLong <404402223@qq.com>
Date: Fri, 27 Mar 2026 09:13:27 +0800
Subject: [PATCH] =?UTF-8?q?fix:[=E8=B5=84=E6=BA=90=E5=BA=93=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86][=E8=AF=95=E5=89=82=E6=89=B9=E9=87=8F]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/lang/en/business/resource/sj.js                |  1 +
 src/lang/zh/business/resource/sj.js                |  1 +
 src/views/business/resource/gsp/comps/gsp/Bj.vue   |  2 +-
 src/views/business/resource/gsp/comps/gsp/Cz.vue   |  2 +-
 .../business/resource/gsp/comps/gsp/CzBatch.vue    | 40 +++++++++++++++++----
 src/views/business/resource/gsp/comps/gsp/Xz.vue   |  2 +-
 src/views/business/resource/sj/comps/CzBatch.vue   | 41 ++++++++++++++++++----
 7 files changed, 72 insertions(+), 17 deletions(-)

diff --git a/src/lang/en/business/resource/sj.js b/src/lang/en/business/resource/sj.js
index f4c7c00..8af702d 100644
--- a/src/lang/en/business/resource/sj.js
+++ b/src/lang/en/business/resource/sj.js
@@ -27,6 +27,7 @@ export default {
 
   cz: 'Dispose',
   sjczfs: 'Dispose Method',
+  czfs: 'Dispose Method',
   czl: 'Amount',
   yuanyin: 'Reason',
   lock: 'Lock',
diff --git a/src/lang/zh/business/resource/sj.js b/src/lang/zh/business/resource/sj.js
index d0bb856..3852d0e 100644
--- a/src/lang/zh/business/resource/sj.js
+++ b/src/lang/zh/business/resource/sj.js
@@ -27,6 +27,7 @@ export default {
 
   cz: '处置',
   sjczfs: '试剂处置方式',
+  czfs: '处置方式',
   czl: '处置量',
   yuanyin: '原因',
   lock: '锁定',
diff --git a/src/views/business/resource/gsp/comps/gsp/Bj.vue b/src/views/business/resource/gsp/comps/gsp/Bj.vue
index 5561301..10c8d4c 100644
--- a/src/views/business/resource/gsp/comps/gsp/Bj.vue
+++ b/src/views/business/resource/gsp/comps/gsp/Bj.vue
@@ -49,7 +49,7 @@
           <!-- 存储条件 -->
           <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" :multiple="true"></BusinessSelect>
+              <BusinessSelect v-model="form.cctj" dictType="business_cctj" :multiple="true"></BusinessSelect>
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/business/resource/gsp/comps/gsp/Cz.vue b/src/views/business/resource/gsp/comps/gsp/Cz.vue
index d65ea4f..e1ac513 100644
--- a/src/views/business/resource/gsp/comps/gsp/Cz.vue
+++ b/src/views/business/resource/gsp/comps/gsp/Cz.vue
@@ -25,7 +25,7 @@
           <el-row>
             <el-col :span="24">
               <el-form-item :label="$t('page.business.resource.gsp.czfs')" prop="czfs">
-                <BusinessSelect v-model="form.czfs" dictType="system_business_czfs"></BusinessSelect>
+                <BusinessSelect v-model="form.czfs" dictType="business_czfs"></BusinessSelect>
               </el-form-item>
             </el-col>
           </el-row>
diff --git a/src/views/business/resource/gsp/comps/gsp/CzBatch.vue b/src/views/business/resource/gsp/comps/gsp/CzBatch.vue
index 33a702b..61b12ec 100644
--- a/src/views/business/resource/gsp/comps/gsp/CzBatch.vue
+++ b/src/views/business/resource/gsp/comps/gsp/CzBatch.vue
@@ -12,9 +12,9 @@
                 :show-overflow-tooltip="true" width="120px" />
               <el-table-column :label="$t('page.business.resource.sj.bh')" align="left" prop="bh"
                 :show-overflow-tooltip="true" width="120px" />
-              <el-table-column :label="$t('page.business.resource.sj.sjczfs')" align="center" width="250px">
+              <el-table-column :label="$t('page.business.resource.sj.czfs')" align="center" width="250px">
                 <template slot-scope="scope">
-                  <BusinessSelect v-model="scope.row.czfs" dictType="system_business_czfs"></BusinessSelect>
+                  <BusinessSelect v-model="scope.row.czfs" dictType="business_czfs"></BusinessSelect>
                 </template>
               </el-table-column>
               <el-table-column :label="$t('page.business.resource.sj.yuanyin')" align="center">
@@ -72,7 +72,7 @@
 </template>
 
 <script>
-import { sj_plcz } from "@/api/business/sj/sj"
+import { plcz } from "@/api/business/gsp/gsp"
 import { mapGetters } from 'vuex'
 import SelectList from "./SelectList";
 import BusinessSelect from '@/views/business/comps/select/BusinessSelect';
@@ -147,10 +147,36 @@ export default {
     save() {
       this.$refs["form"].validate(valid => {
         if (valid) {
-          sj_plcz(this.form).then(response => {
-            this.open = false
-            this.$emit('callback')
-          })
+          let params = this.form
+          params.list = this.selectList
+          if (this.selectList.length <= 0) {
+            this.$modal.msgError("请选择要操作的试剂")
+          } else {
+            for (var i = 0; i < params.list.length; i++) {
+              if (!params.list[i].czfs || params.list[i].czfs == '') {
+                this.$modal.msgError(params.list[i].mc + "处置方式不能为空")
+                return
+              }
+              if (!params.list[i].czyy || params.list[i].czyy == '') {
+                this.$modal.msgError(params.list[i].mc + "处置原因不能为空")
+                return
+              } else {
+                params.list[i].remark = params.list[i].czyy
+              }
+              if (!params.list[i].czl || params.list[i].czl == '') {
+                this.$modal.msgError(params.list[i].mc + "处置量不能为空")
+                return
+              }
+            }
+            this.$modal.loading()
+            plcz(params).then(response => {
+              this.open = false
+              this.$emit('callback')
+              this.$modal.closeLoading()
+            }).finally(() => {
+              this.$modal.closeLoading()
+            })
+          }
         }
       })
     }
diff --git a/src/views/business/resource/gsp/comps/gsp/Xz.vue b/src/views/business/resource/gsp/comps/gsp/Xz.vue
index 7f3d5cd..0258f51 100644
--- a/src/views/business/resource/gsp/comps/gsp/Xz.vue
+++ b/src/views/business/resource/gsp/comps/gsp/Xz.vue
@@ -61,7 +61,7 @@
           <!-- 存储条件 -->
           <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" :multiple="true"></BusinessSelect>
+              <BusinessSelect v-model="form.cctj" dictType="business_cctj" :multiple="true"></BusinessSelect>
             </el-form-item>
           </el-col>
           <!-- 接收日期 -->
diff --git a/src/views/business/resource/sj/comps/CzBatch.vue b/src/views/business/resource/sj/comps/CzBatch.vue
index 55c6bcb..fadd074 100644
--- a/src/views/business/resource/sj/comps/CzBatch.vue
+++ b/src/views/business/resource/sj/comps/CzBatch.vue
@@ -56,7 +56,8 @@
           <el-col :span="24">
             <el-form-item :label="$t('form.password')" prop="qmrmm">
               <div class="sbzdtcma"> <input type="text"></div>
-              <el-input type="password" @contextmenu.native.prevent @copy.native.prevent @cut.native.prevent v-model="form.qmrmm" maxlength="20"  autocomplete="off" auto-complete="new-password" show-password
+              <el-input type="password" @contextmenu.native.prevent @copy.native.prevent @cut.native.prevent
+                v-model="form.qmrmm" maxlength="20" autocomplete="off" auto-complete="new-password" show-password
                 :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
@@ -104,7 +105,7 @@ export default {
   },
   computed: {
     ...mapGetters([
-      'nickName','name'
+      'nickName', 'name'
     ]),
   },
   created() {
@@ -146,13 +147,39 @@ export default {
     save() {
       this.$refs["form"].validate(valid => {
         if (valid) {
-          sj_plcz(this.form).then(response => {
-            this.open = false
-            this.$emit('callback')
-          })
+          let params = this.form
+          params.list = this.selectList
+          if (this.selectList.length <= 0) {
+            this.$modal.msgError("请选择要操作的试剂")
+          } else {
+            for (var i = 0; i < params.list.length; i++) {
+              if (!params.list[i].czfs || params.list[i].czfs == '') {
+                this.$modal.msgError(params.list[i].mc + "处置方式不能为空")
+                return
+              }
+              if (!params.list[i].czyy || params.list[i].czyy == '') {
+                this.$modal.msgError(params.list[i].mc + "处置原因不能为空")
+                return
+              } else {
+                params.list[i].remark = params.list[i].czyy
+              }
+              if (!params.list[i].czl || params.list[i].czl == '') {
+                this.$modal.msgError(params.list[i].mc + "处置量不能为空")
+                return
+              }
+            }
+            this.$modal.loading()
+            sj_plcz(params).then(response => {
+              this.open = false
+              this.$emit('callback')
+              this.$modal.closeLoading()
+            }).finally(() => {
+              this.$modal.closeLoading()
+            })
+          }
         }
       })
-    }
   }
 }
+}
 </script>