From 704a537fee0f98b94da713bcd59d474b12a7ae82 Mon Sep 17 00:00:00 2001
From: HanLong <404402223@qq.com>
Date: Mon, 22 Dec 2025 21:37:37 +0800
Subject: [PATCH] =?UTF-8?q?feat:[=E8=B5=84=E6=BA=90=E5=BA=93=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86][=E8=AF=95=E5=89=82=E7=AE=A1=E7=90=86]=E5=A4=84?=
 =?UTF-8?q?=E7=BD=AE=E8=AF=95=E5=89=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/lang/en.js                                     |   3 +-
 src/lang/en/business/resource/sj/sj.js             |  18 ++-
 src/lang/zh.js                                     |   5 +-
 src/lang/zh/business/resource/sj/sj.js             |  20 ++-
 src/views/business/comps/select/BusinessSelect.vue |   3 +-
 src/views/business/resource/mjy/comps/Czyj.vue     |   4 +-
 src/views/business/resource/sj/comps/Cz.vue        | 173 +++++++++++++++++++++
 src/views/business/resource/sj/comps/CzBatch.vue   | 154 ++++++++++++++++++
 src/views/business/resource/sj/list.vue            |  95 ++++++-----
 9 files changed, 409 insertions(+), 66 deletions(-)
 create mode 100644 src/views/business/resource/sj/comps/Cz.vue
 create mode 100644 src/views/business/resource/sj/comps/CzBatch.vue

diff --git a/src/lang/en.js b/src/lang/en.js
index 8f85f01..4f51bfc 100644
--- a/src/lang/en.js
+++ b/src/lang/en.js
@@ -41,6 +41,7 @@ export default {
     confirm: 'Confirm',
     cancel: 'Cancel',
     operate: 'Action',
+    delete: 'Delete',
     detail: 'View',
     placeholderInput: 'Please Enter',
     placeholderSelect: 'Please Select',
@@ -118,7 +119,7 @@ export default {
         zcg,
         mjy,
         yq,
-        sj
+        sj,
       }
     }
   }
diff --git a/src/lang/en/business/resource/sj/sj.js b/src/lang/en/business/resource/sj/sj.js
index 9ef50d4..2b5a095 100644
--- a/src/lang/en/business/resource/sj/sj.js
+++ b/src/lang/en/business/resource/sj/sj.js
@@ -3,22 +3,30 @@ export default {
     gdts:'请确认是否归档以下麻精药',
     mc:'名称',
     bh:'编号',
+    ssbm: '所属部门',
+    gxsjk: '更新试剂库',
     jyzt:'借阅状态',
     zjzt:'制剂状态',
     sxrq:'失效日期',
-    nd:'浓度',
+    nd:'浓度/含量/纯度',
     kcl:'库存量',
+    gg: '规格',
+    ly: '来源',
+    sssy: '所属试验',
+    ph: '批号',
+    yxzq: '有效周期',
     zcgMc:'暂存柜',
     cctj:'存储条件',
     ccwz:'存储位置',
 
-    plff:'批量发放',
-    plczyj:'批量处置药剂',
-    plczrq:'批量处置容器',
-    ysff:'钥匙发放',
+    plcz:'批量处置',
     plsd:'批量锁定',
     plgd:'批量归档',
 
+    cz: '处置',
+    sjczfs: '试剂处置方式',
+    czl: '处置量',
+    yuanyin:'原因',
     lock:'锁定',
     unlock:'解锁',
     detail:'详情',
diff --git a/src/lang/zh.js b/src/lang/zh.js
index 8f917f3..0a994d9 100644
--- a/src/lang/zh.js
+++ b/src/lang/zh.js
@@ -16,7 +16,7 @@ import zcg from './zh/business/resource/zcg/zcg'
 // 麻精药
 import mjy from './zh/business/resource/mjy/mjy'
 // 试剂库存
-import sj from './en/business/resource/sj/sj'
+import sj from './zh/business/resource/sj/sj'
 export default {
   system: {
     name: '华西海圻ELN系统',
@@ -38,6 +38,7 @@ export default {
     confirm: '确认',
     cancel: '取消',
     operate: '操作',
+    delete: '删除',
     detail: '详情',
     placeholderInput: '请输入',
     placeholderSelect: '请选择',
@@ -115,7 +116,7 @@ export default {
         zcg,
         mjy,
         yq,
-        sj
+        sj,
       }
     }
   }
diff --git a/src/lang/zh/business/resource/sj/sj.js b/src/lang/zh/business/resource/sj/sj.js
index 49fa070..e5f3e6e 100644
--- a/src/lang/zh/business/resource/sj/sj.js
+++ b/src/lang/zh/business/resource/sj/sj.js
@@ -3,22 +3,30 @@ export default {
     gdts:'请确认是否归档以下麻精药',
     mc:'名称',
     bh:'编号',
+    ssbm: '所属部门',
+    gxsjk: '更新试剂库',
     jyzt:'借阅状态',
     zjzt:'制剂状态',
     sxrq:'失效日期',
-    nd:'浓度',
+    nd:'浓度/含量/纯度',
     kcl:'库存量',
+    gg: '规格',
+    ly: '来源',
+    sssy: '所属试验',
+    ph: '批号',
+    yxzq: '有效周期',
     zcgMc:'暂存柜',
     cctj:'存储条件',
     ccwz:'存储位置',
 
-    plff:'批量发放',
-    plczyj:'批量处置药剂',
-    plczrq:'批量处置容器',
-    ysff:'钥匙发放',
+    plcz:'批量处置',
     plsd:'批量锁定',
     plgd:'批量归档',
 
+    cz: '处置',
+    sjczfs: '试剂处置方式',
+    czl: '处置量',
+    yuanyin:'原因',
     lock:'锁定',
     unlock:'解锁',
     detail:'详情',
@@ -34,5 +42,5 @@ export default {
     shxgkc:'审核修改库存',
     shbj:'审核编辑',
 
-  
+
 }
\ No newline at end of file
diff --git a/src/views/business/comps/select/BusinessSelect.vue b/src/views/business/comps/select/BusinessSelect.vue
index 365d124..965e259 100644
--- a/src/views/business/comps/select/BusinessSelect.vue
+++ b/src/views/business/comps/select/BusinessSelect.vue
@@ -1,10 +1,11 @@
-<!-- 试验相关的各类选择器 -->
+<!-- 试验相关的各类选择器 dictType -->
 <!-- 存储条件：system_business_cctj -->
 <!-- 存储位置：system_business_ccwz -->
 <!-- 浓度单位：system_business_nndw -->
 <!-- 质量单位：system_business_zldw -->
 <!-- 体积单位：system_business_tjdw -->
 <!-- 有效期单位：system_business_yxqdw -->
+<!-- 处置方式：system_business_czfs -->
 <template>
   <div>
     <el-select style="width:100%" v-model="selected" :placeholder="$t('form.placeholderSelect')"  :disabled="readonly" :multiple="multiple" @change="handleChange" :filterable="filterable">
diff --git a/src/views/business/resource/mjy/comps/Czyj.vue b/src/views/business/resource/mjy/comps/Czyj.vue
index f1673b6..a4cb37d 100644
--- a/src/views/business/resource/mjy/comps/Czyj.vue
+++ b/src/views/business/resource/mjy/comps/Czyj.vue
@@ -62,8 +62,8 @@ G<template>
             </el-col>
             <el-col :span="12">
               <el-form-item :label="$t('page.business.zykgl.mjy.czl')" prop="czl">
-                <el-input type="text" v-model="form.czl" maxlength="50" :placeholder="$t('form.placeholderInput')" > <template slot="append">{{ form.kcdw }}</template>
-                  </el-input>
+                <el-input-number type="text" v-model="form.czl" maxlength="50" :placeholder="$t('form.placeholderInput')" > <template slot="append">{{ form.kcdw }}</template>
+                  </el-input-number>
               </el-form-item>
             </el-col>
           </el-row>
diff --git a/src/views/business/resource/sj/comps/Cz.vue b/src/views/business/resource/sj/comps/Cz.vue
new file mode 100644
index 0000000..cec3453
--- /dev/null
+++ b/src/views/business/resource/sj/comps/Cz.vue
@@ -0,0 +1,173 @@
+G<template>
+  <div>
+    <!-- 批量处置试剂弹窗 -->
+    <el-dialog :title="$t('page.business.zykgl.sj.cz')" :visible.sync="open" width="500px" append-to-body
+      :close-on-click-modal="false">
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+        <template>
+          <el-row>
+            <el-col :span="24">
+              <el-form-item :label="$t('page.business.zykgl.sj.mc')" prop="mc">
+                <el-input type="text" v-model="form.mc" 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('page.business.zykgl.sj.bh')" prop="glyj">
+                <el-input type="text" v-model="form.bh" 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('page.business.zykgl.sj.sjczfs')" prop="czfs">
+                <BusinessSelect v-model="form.czfs" dictType="system_business_czfs"></BusinessSelect>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <el-form-item :label="$t('page.business.zykgl.sj.czl')" prop="czl">
+                <el-input type="text" v-model="form.czl" maxlength="50" :placeholder="$t('form.placeholderInput')" >
+                  <template slot="append">{{ form.kcdw }}</template>
+                </el-input>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <el-form-item :label="$t('page.business.zykgl.sj.yuanyin')" prop="remark">
+                <el-input type="textarea" :rows="2" v-model="form.remark" maxlength="500" :placeholder="$t('form.placeholderInput')" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </template>
+        <el-row>
+          <el-col :span="24">
+            <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-row>
+        <el-row>
+          <el-col :span="24">
+            <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.password')" prop="qmrmm">
+              <el-input type="password" v-model="form.qmrmm" maxlength="20" :placeholder="$t('form.placeholderInput')" />
+            </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 { mjy_jd, mjy_jdBatch } from "@/api/business/mjy/mjy"
+import { mapGetters } from 'vuex'
+import SelectList from "./SelectList";
+import BusinessSelect from '@/views/business/comps/select/BusinessSelect';
+export default {
+  name: "MjyBj",
+  components: { SelectList, BusinessSelect },
+  data() {
+    return {
+      ids: [],
+      selectList: [],
+      open: false,
+      form: {},
+      rules: {
+        czfs: [
+          { required: true, message: this.$t('page.business.zykgl.sj.sjczfs') + this.$t('form.notEmpty'), trigger: "change" },
+          { min: 0, max: 50, message: this.$t('page.business.zykgl.sj.sjczfs') + this.$t('form.lengthLimit') + '50', trigger: 'blur' }
+        ],
+        czl: [
+          { required: true, message: this.$t('page.business.zykgl.sj.czl') + this.$t('form.notEmpty'), trigger: "change" },
+        ],
+        remark: [
+          { required: true, message: this.$t('page.business.zykgl.sj.yuanyin') + this.$t('form.notEmpty'), trigger: "change" },
+        ],
+        qmrmm: [
+          { required: true, message: this.$t('form.signerPsw') + this.$t('form.notEmpty'), trigger: "change" },
+        ]
+
+      }
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'nickName'
+    ]),
+  },
+  created() {
+  },
+  methods: {
+    showBatch(val) {
+      this.reset()
+      this.isBatch = true
+      this.form.ids = val.map(item => item.id)
+      this.selectList = val
+      this.open = true
+    },
+    cancel() {
+      this.open = false
+    },
+    reset() {
+      this.form = {
+        id: null,
+        ids: null,
+        mc: null,
+        bh: null,
+        qmyy: '处置',
+        kcdw: '',
+        qmrmm: null
+      }
+      this.resetForm("form")
+    },
+    show(row) {
+      this.reset()
+      this.isBatch = false
+      this.form.ids = []
+      this.selectList = []
+      this.form.id = row.id
+      this.form.mc = row.mc
+      this.form.bh = row.bh
+      this.form.kcdw = row.kcdw
+      this.open = true
+    },
+    save() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.isBatch) {
+            mjy_jdBatch(this.form).then(response => {
+              this.open = false
+              this.$emit('callback')
+            })
+          } else {
+            mjy_jd(this.form).then(response => {
+              this.open = false
+              this.$emit('callback')
+            })
+          }
+
+        }
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/business/resource/sj/comps/CzBatch.vue b/src/views/business/resource/sj/comps/CzBatch.vue
new file mode 100644
index 0000000..02e05a6
--- /dev/null
+++ b/src/views/business/resource/sj/comps/CzBatch.vue
@@ -0,0 +1,154 @@
+G<template>
+  <div>
+    <!-- 处置试剂弹窗 -->
+    <el-dialog :title="$t('page.business.zykgl.sj.cz')" :visible.sync="open" width="1200px" append-to-body
+      :close-on-click-modal="false">
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+        <el-row style="margin:10px 0px;">
+          <el-col :span="24">
+            <el-table :data="selectList" border>
+              <el-table-column :label="$t('page.business.zykgl.sj.mc')" align="left" prop="mc"
+                :show-overflow-tooltip="true" width="120px" />
+              <el-table-column :label="$t('page.business.zykgl.sj.bh')" align="left" prop="bh"
+                :show-overflow-tooltip="true" width="120px" />
+              <el-table-column :label="$t('page.business.zykgl.sj.sjczfs')" align="center" width="250px">
+                <template slot-scope="scope">
+                  <BusinessSelect v-model="scope.row.czfs" dictType="system_business_czfs"></BusinessSelect>
+                </template>
+              </el-table-column>
+              <el-table-column :label="$t('page.business.zykgl.sj.yuanyin')" align="center">
+                <template slot-scope="scope">
+                  <el-input type="text" v-model="scope.row.czyy" maxlength="50"
+                    :placeholder="$t('form.placeholderInput')" />
+                </template>
+              </el-table-column>
+              <el-table-column :label="$t('page.business.zykgl.sj.czl')" align="center">
+                <template slot-scope="scope">
+                  <el-input type="text" v-model="scope.row.czl" maxlength="50"
+                    :placeholder="$t('form.placeholderInput')"> <template slot="append">{{ scope.row.kcdw }}</template>
+                  </el-input>
+                </template>
+              </el-table-column>
+              <el-table-column :label="$t('form.operate')" align="center" width="150px">
+                <template slot-scope="scope">
+                  <el-button size="mini" type="text" @click="handleSc(scope.row)">{{
+                    $t('form.delete') }}</el-button>
+                </template>
+              </el-table-column>
+            </el-table>
+          </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.password')" prop="qmrmm">
+              <el-input type="password" v-model="form.qmrmm" maxlength="20"
+                :placeholder="$t('form.placeholderInput')" />
+            </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 { mjy_jd, mjy_jdBatch } from "@/api/business/mjy/mjy"
+import { mapGetters } from 'vuex'
+import SelectList from "./SelectList";
+import BusinessSelect from '@/views/business/comps/select/BusinessSelect';
+export default {
+  name: "CzBatch",
+  components: { SelectList, BusinessSelect },
+  data() {
+    return {
+      ids: [],
+      selectList: [],
+      open: false,
+      form: {},
+      rules: {
+        czfs: [
+          { required: true, message: this.$t('page.business.zykgl.sj.sjczfs') + this.$t('form.notEmpty'), trigger: "change" },
+          { min: 0, max: 50, message: this.$t('page.business.zykgl.sj.sjczfs') + this.$t('form.lengthLimit') + '50', trigger: 'blur' }
+        ],
+        czl: [
+          { required: true, message: this.$t('page.business.zykgl.sj.czl') + this.$t('form.notEmpty'), trigger: "change" },
+        ],
+        remark: [
+          { required: true, message: this.$t('page.business.zykgl.sj.yuanyin') + this.$t('form.notEmpty'), trigger: "change" },
+        ],
+        qmrmm: [
+          { required: true, message: this.$t('form.signerPsw') + this.$t('form.notEmpty'), trigger: "change" },
+        ]
+
+      }
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'nickName'
+    ]),
+  },
+  created() {
+  },
+  methods: {
+    showBatch(val) {
+      this.reset()
+      this.isBatch = true
+      this.form.ids = val.map(item => item.id)
+      this.selectList = val
+      this.open = true
+    },
+    cancel() {
+      this.open = false
+    },
+    reset() {
+      this.form = {
+        id: null,
+        ids: null,
+        mc: null,
+        bh: null,
+        qmyy: '处置',
+        kcdw: '',
+        qmrmm: null
+      }
+      this.resetForm("form")
+    },
+    save() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.isBatch) {
+            mjy_jdBatch(this.form).then(response => {
+              this.open = false
+              this.$emit('callback')
+            })
+          } else {
+            mjy_jd(this.form).then(response => {
+              this.open = false
+              this.$emit('callback')
+            })
+          }
+
+        }
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/business/resource/sj/list.vue b/src/views/business/resource/sj/list.vue
index 94a4f0d..5f057e7 100644
--- a/src/views/business/resource/sj/list.vue
+++ b/src/views/business/resource/sj/list.vue
@@ -1,3 +1,4 @@
+<!-- 试剂管理 -->
 <template>
   <div>
     <!-- 详情 -->
@@ -7,21 +8,25 @@
 
     <!-- 列表 -->
     <template v-else>
-      <div class="app-container mjy">
-        <el-form :model="queryParams" ref="queryForm" class="search-area" size="small" :inline="true"
-          label-width="88px">
+      <div class="app-container sj">
+        <el-form :model="queryParams" ref="queryForm" class="search-area" size="small" :inline="true">
           <!-- 名称 -->
-          <el-form-item :label="$t('page.business.zykgl.mjy.mc') + '：'">
+          <el-form-item :label="$t('page.business.zykgl.sj.mc') + '：'">
             <el-input v-model="queryParams.mc" clearable @change="handleQuery"
               :placeholder="$t('form.placeholderInput')" />
           </el-form-item>
           <!-- 编号 -->
-          <el-form-item :label="$t('page.business.zykgl.mjy.bh') + '：'">
+          <el-form-item :label="$t('page.business.zykgl.sj.bh') + '：'">
             <el-input v-model="queryParams.bh" clearable @change="handleQuery"
               :placeholder="$t('form.placeholderInput')" />
           </el-form-item>
+           <!-- 所属部门 -->
+          <el-form-item :label="$t('page.business.zykgl.sj.ssbm') + '：'">
+            <el-input v-model="queryParams.bm" clearable @change="handleQuery"
+              :placeholder="$t('form.placeholderInput')" />
+          </el-form-item>
           <!-- 借阅状态 -->
-          <el-form-item :label="$t('page.business.zykgl.mjy.jyzt') + '：'">
+          <el-form-item :label="$t('page.business.zykgl.sj.jyzt') + '：'">
             <el-select v-model="queryParams.jyzt" :placeholder="$t('form.placeholderSelect')" clearable
               @change="handleQuery">
               <el-option key="1" :label="$t('page.business.zykgl.jyzt.wjy')" value="1" />
@@ -30,7 +35,7 @@
             </el-select>
           </el-form-item>
           <!-- 制剂状态 -->
-          <el-form-item :label="$t('page.business.zykgl.mjy.zjzt') + '：'">
+          <el-form-item :label="$t('page.business.zykgl.sj.zjzt') + '：'">
             <el-select v-model="queryParams.zjzt" :placeholder="$t('form.placeholderSelect')" clearable
               @change="handleQuery">
               <el-option key="1" :label="$t('page.business.zykgl.zjzt.rk')" value="1" />
@@ -42,7 +47,7 @@
             </el-select>
           </el-form-item>
           <!-- 失效日期 -->
-          <el-form-item :label="$t('page.business.zykgl.mjy.sxrq') + '：'">
+          <el-form-item :label="$t('page.business.zykgl.sj.sxrq') + '：'">
             <el-date-picker v-model="daterange" class="chat-histogram-daterange" type="daterange" range-separator="-"
               :start-placeholder="$t('form.startDate')" :end-placeholder="$t('form.endDate')" value-format="yyyy-MM-dd"
               @change="handleQuery" style="width: 250px;" />
@@ -55,28 +60,16 @@
 
         <el-row :gutter="10" class="mb8">
           <el-col :span="1.5">
-            <!-- 批量发放 -->
-            <el-button type="primary" :disabled="multiple" @click="handlePlff"
+            <!-- 更新试剂库 -->
+            <el-button type="primary"
               v-hasPermi="['business:resource:mjy:ff']">{{
-                $t('page.business.zykgl.mjy.plff') }}</el-button>
+                $t('page.business.zykgl.sj.gxsjk') }}</el-button>
           </el-col>
           <el-col :span="1.5">
-            <!-- 批量处置药剂 -->
-            <el-button type="primary" :disabled="multiple" @click="handlePlczyj"
+            <!-- 批量处置 -->
+            <el-button type="primary" :disabled="multiple" @click="handlePlcz"
               v-hasPermi="['business:resource:mjy:czyj']">{{
-                $t('page.business.zykgl.mjy.plczyj') }}</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <!-- 批量处置容器 -->
-            <el-button type="primary" :disabled="multiple" @click="handlePlczrq"
-              v-hasPermi="['business:resource:mjy:czrq']">{{
-                $t('page.business.zykgl.mjy.plczrq') }}</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <!-- 钥匙发放 -->
-            <el-button type="primary" :disabled="multiple" @click="handleYsff"
-              v-hasPermi="['business:resource:mjy:ysff']">{{
-                $t('page.business.zykgl.mjy.ysff') }}</el-button>
+                $t('page.business.zykgl.sj.plcz') }}</el-button>
           </el-col>
           <el-col :span="1.5">
             <!-- 批量锁定 -->
@@ -90,32 +83,32 @@
               v-hasPermi="['business:resource:mjy:gd']">{{
                 $t('page.business.zykgl.mjy.plgd') }}</el-button>
           </el-col>
-          <el-col :span="1.5">
-            <!-- 导出 -->
-            <el-button type="primary" :disabled="multiple" @click="handleDc"
-              v-hasPermi="['business:resource:mjy:dc']">{{
-                $t('form.export') }}</el-button>
-          </el-col>
         </el-row>
 
         <el-table v-loading="loading" :data="list" @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="55" align="center" :selectable="checkSelectable" />
-          <el-table-column :label="$t('page.business.zykgl.mjy.mc')" align="left" prop="mc"
+          <el-table-column :label="$t('page.business.zykgl.sj.mc')" align="left" prop="mc"
             :show-overflow-tooltip="true" />
-          <el-table-column :label="$t('page.business.zykgl.mjy.bh')" align="center" prop="bh"
+          <el-table-column :label="$t('page.business.zykgl.sj.bh')" align="center" prop="bh"
             :show-overflow-tooltip="true" />
-          <el-table-column :label="$t('page.business.zykgl.mjy.nd')" align="center">
+          <el-table-column :label="$t('page.business.zykgl.sj.nd')" align="center" width="150px">
             <template slot-scope="scope">
               {{ scope.row.nd }}{{ scope.row.nddw }}
             </template>
           </el-table-column>
-          <el-table-column :label="$t('page.business.zykgl.mjy.kcl')" align="center">
+          <el-table-column :label="$t('page.business.zykgl.sj.kcl')" align="center">
             <template slot-scope="scope">
               {{ scope.row.kc }}{{ scope.row.kcdw }}
             </template>
           </el-table-column>
+          <el-table-column :label="$t('page.business.zykgl.sj.gg')" align="center" prop="gg" width="150px" />
+          <el-table-column :label="$t('page.business.zykgl.sj.ly')" align="center" prop="ly" width="150px" />
+          <el-table-column :label="$t('page.business.zykgl.sj.ssbm')" align="center" prop="ssbm" width="150px" />
+          <el-table-column :label="$t('page.business.zykgl.sj.sssy')" align="center" prop="sssy" width="150px" />
+          <el-table-column :label="$t('page.business.zykgl.sj.ph')" align="center" prop="ph" width="150px" />
+          <el-table-column :label="$t('page.business.zykgl.sj.yxzq')" align="center" prop="yxzq" width="150px" />
+
           <el-table-column :label="$t('page.business.zykgl.mjy.sxrq')" align="center" prop="sxrq" width="150px" />
-          <el-table-column :label="$t('page.business.zykgl.mjy.zcgMc')" align="center" prop="zcgMc" width="130px" />
           <el-table-column :label="$t('page.business.zykgl.mjy.cctj')" align="center" prop="cctj" width="130px" />
           <el-table-column :label="$t('page.business.zykgl.mjy.ccwz')" align="center" prop="ccwz" width="130px" />
 
@@ -148,9 +141,9 @@
                 v-hasPermi="['business:resource:mjy:ff']">{{
                   $t('page.business.zykgl.mjy.fafang') }}</el-button>
               <!-- 处置药剂 -->
-              <el-button size="mini" type="text" @click="handleCzyj(scope.row)"
+              <el-button size="mini" type="text" @click="handleCz(scope.row)"
                 v-hasPermi="['business:resource:mjy:czyj']">{{
-                  $t('page.business.zykgl.mjy.czyj') }}</el-button>
+                  $t('page.business.zykgl.sj.cz') }}</el-button>
               <!-- 处置容器 -->
               <el-button size="mini" type="text" @click="handleCzrq(scope.row)"
                 v-hasPermi="['business:resource:mjy:czrq']">{{
@@ -224,8 +217,10 @@
       <Gh ref="Gh" @callback="handleQuery" />
       <!-- 发放 -->
       <Ff ref="Ff" @callback="handleQuery" />
-      <!-- 处置药剂 -->
-      <Czyj ref="Czyj" @callback="handleQuery" />
+      <!-- 处置 -->
+      <Cz ref="Cz" @callback="handleQuery" />
+      <!-- 批量处置 -->
+      <CzBatch ref="CzBatch"/>
       <!-- 处置容器 -->
       <Czrq ref="Czrq" @callback="handleQuery" />
       <!-- 钥匙发放 -->
@@ -249,12 +244,14 @@ import Jy from "./comps/Jy";
 import Gh from "./comps/Gh";
 import Ff from "./comps/Ff";
 import Czrq from "./comps/Czrq";
+import Cz from "./comps/Cz";
+import CzBatch from "./comps/CzBatch";
 import Czyj from "./comps/Czyj";
 import Ysff from "./comps/Ysff";
 
 export default {
   name: "Sj",
-  components: { Sd, Js, Gd, Xq, Jd, Bj, Shbj, Xgkc, Shxgkc, Jy, Gh,Czyj,Czrq,Ff,Ysff },
+  components: { Sd, Js, Gd, Xq, Jd, Bj, Shbj, Xgkc, Shxgkc, Jy, Gh,Czyj,Czrq, Cz, CzBatch, Ff,Ysff },
   data() {
     return {
       showDetail: false,
@@ -299,13 +296,13 @@ export default {
     handlePlczrq() {
       this.$refs.Czrq.showBatch(this.selectList)
     },
-    //处置药剂
-    handleCzyj(row) {
-      this.$refs.Czyj.show(row)
+    //处置
+    handleCz(row) {
+      this.$refs.Cz.show(row)
     },
-     //批量处置药剂
-    handlePlczyj() {
-      this.$refs.Czyj.showBatch(this.selectList)
+     //批量处置
+    handlePlcz() {
+      this.$refs.CzBatch.showBatch(this.selectList)
     },
     //编辑
     handleBj(row) {
@@ -409,5 +406,5 @@ export default {
 </script>
 
 <style rel="stylesheet/scss" lang="scss">
-.mjy {}
+.sj {}
 </style>
\ No newline at end of file