From c8959a8c2e6c0100c4adaf04e893dbad1318558f Mon Sep 17 00:00:00 2001
From: HanLong <404402223@qq.com>
Date: Tue, 30 Dec 2025 00:15:18 +0800
Subject: [PATCH] =?UTF-8?q?refacotr:[=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]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/business/sj/sj.js                        | 118 +++++++++++
 src/api/business/sj/sjkc.js                      |  37 ----
 src/api/business/sj/sjkcJcgj.js                  |  37 ----
 src/lang/en/business/resource/sj/sj.js           |  97 +++++----
 src/lang/zh/business/resource/sj/sj.js           |  97 +++++----
 src/views/business/resource/sj/comps/Cz.vue      |  33 +--
 src/views/business/resource/sj/comps/CzBatch.vue |  29 +--
 src/views/business/resource/sj/comps/Gd.vue      |   6 +-
 src/views/business/resource/sj/comps/Js.vue      |  10 +-
 src/views/business/resource/sj/comps/Sd.vue      |  12 +-
 src/views/business/resource/sj/comps/Xgkc.vue    |   4 +-
 src/views/business/resource/sj/comps/Xq.vue      | 256 +++++++++++++++++------
 src/views/business/resource/sj/list.vue          |  25 ++-
 13 files changed, 478 insertions(+), 283 deletions(-)
 create mode 100644 src/api/business/sj/sj.js
 delete mode 100644 src/api/business/sj/sjkc.js
 delete mode 100644 src/api/business/sj/sjkcJcgj.js

diff --git a/src/api/business/sj/sj.js b/src/api/business/sj/sj.js
new file mode 100644
index 0000000..0b3eb5a
--- /dev/null
+++ b/src/api/business/sj/sj.js
@@ -0,0 +1,118 @@
+import request from '@/utils/request'
+
+// 查询试剂库存列表
+export function sj_list(query) {
+  return request({
+    url: '/system/business/sj/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询试剂库存详情
+export function sj_info(query) {
+  return request({
+    url: '/system/business/sj/info',
+    method: 'get',
+    params: query
+  })
+}
+
+// 保存试剂库存
+export function sj_save(data) {
+  return request({
+    url: '/system/business/sj/save',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改库存
+export function sj_xgkc(data) {
+  return request({
+    url: '/system/business/sj/xgkc',
+    method: 'post',
+    data: data
+  })
+}
+
+// 处置
+export function sj_cz(data) {
+  return request({
+    url: '/system/business/sj/cz',
+    method: 'post',
+    data: data
+  })
+}
+
+// 批量处置
+export function sj_plcz(data) {
+  return request({
+    url: '/system/business/sj/plcz',
+    method: 'post',
+    data: data
+  })
+}
+
+// 解锁
+export function sj_js(data) {
+  return request({
+    url: '/system/business/sj/js',
+    method: 'post',
+    data: data
+  })
+}
+
+// 锁定
+export function sj_sd(data) {
+  return request({
+    url: '/system/business/sj/sd',
+    method: 'post',
+    data: data
+  })
+}
+
+// 批量锁定
+export function sj_plsd(data) {
+  return request({
+    url: '/system/business/sj/plsd',
+    method: 'post',
+    data: data
+  })
+}
+
+// 归档
+export function sj_gd(data) {
+  return request({
+    url: '/system/business/sj/gd',
+    method: 'post',
+    data: data
+  })
+}
+
+// 批量归档
+export function sj_plgd(data) {
+  return request({
+    url: '/system/business/sj/plgd',
+    method: 'post',
+    data: data
+  })
+}
+
+// 查询试剂库存-稽查轨迹列表
+export function jcgjList(query) {
+  return request({
+    url: '/system/business/sj/jcgjList',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询试剂库存-台账
+export function tzList(query) {
+  return request({
+    url: '/system/business/sj/tzList',
+    method: 'get',
+    params: query
+  })
+}
\ No newline at end of file
diff --git a/src/api/business/sj/sjkc.js b/src/api/business/sj/sjkc.js
deleted file mode 100644
index 1607cbc..0000000
--- a/src/api/business/sj/sjkc.js
+++ /dev/null
@@ -1,37 +0,0 @@
-import request from '@/utils/request'
-
-// 查询试剂库存列表
-export function sjkc_list(query) {
-  return request({
-    url: '/system/business/sjkc/list',
-    method: 'get',
-    params: query
-  })
-}
-
-// 查询试剂库存详情
-export function sjkc_info(query) {
-  return request({
-    url: '/system/business/sjkc/info',
-    method: 'get',
-    params: query
-  })
-}
-
-// 保存试剂库存
-export function sjkc_save(data) {
-  return request({
-    url: '/system/business/sjkc/save',
-    method: 'post',
-    data: data
-  })
-}
-
-// 修改库存
-export function sjkc_xgkc(data) {
-  return request({
-    url: '/system/business/sjkc/xgkc',
-    method: 'post',
-    data: data
-  })
-}
\ No newline at end of file
diff --git a/src/api/business/sj/sjkcJcgj.js b/src/api/business/sj/sjkcJcgj.js
deleted file mode 100644
index e0645c6..0000000
--- a/src/api/business/sj/sjkcJcgj.js
+++ /dev/null
@@ -1,37 +0,0 @@
-import request from '@/utils/request'
-
-// 查询试剂库存-稽查轨迹列表
-export function sjkcJcgj_list(query) {
-  return request({
-    url: '/project/sjkcJcgj/list',
-    method: 'get',
-    params: query
-  })
-}
-
-// 查询试剂库存-稽查轨迹详情
-export function sjkcJcgj_info(query) {
-  return request({
-    url: '/project/sjkcJcgj/info',
-    method: 'get',
-    params: query
-  })
-}
-
-// 保存试剂库存-稽查轨迹
-export function sjkcJcgj_save(data) {
-  return request({
-    url: '/project/sjkcJcgj/save',
-    method: 'post',
-    data: data
-  })
-}
-
-// 删除试剂库存-稽查轨迹
-export function sjkcJcgj_delete(data) {
-  return request({
-    url: '/project/sjkcJcgj/delete',
-    method: 'post',
-    data: data
-  })
-}
\ No newline at end of file
diff --git a/src/lang/en/business/resource/sj/sj.js b/src/lang/en/business/resource/sj/sj.js
index 2b5a095..917769b 100644
--- a/src/lang/en/business/resource/sj/sj.js
+++ b/src/lang/en/business/resource/sj/sj.js
@@ -1,45 +1,60 @@
 export default {
-    sdts:'请确认是否锁定以下麻精药',
-    gdts:'请确认是否归档以下麻精药',
-    mc:'名称',
-    bh:'编号',
-    ssbm: '所属部门',
-    gxsjk: '更新试剂库',
-    jyzt:'借阅状态',
-    zjzt:'制剂状态',
-    sxrq:'失效日期',
-    nd:'浓度/含量/纯度',
-    kcl:'库存量',
-    gg: '规格',
-    ly: '来源',
-    sssy: '所属试验',
-    ph: '批号',
-    yxzq: '有效周期',
-    zcgMc:'暂存柜',
-    cctj:'存储条件',
-    ccwz:'存储位置',
+  sdts: '请确认是否锁定以下麻精药',
+  gdts: '请确认是否归档以下麻精药',
+  mc: '名称',
+  bh: '编号',
+  ssbm: '所属部门',
+  gxsjk: '更新试剂库',
+  jyzt: '借阅状态',
+  zjzt: '制剂状态',
+  sxrq: '失效日期',
+  nd: '浓度/含量/纯度',
+  kcl: '库存量',
+  gg: '规格',
+  ly: '来源',
+  sssy: '所属试验',
+  ph: '批号',
+  yxzq: '有效周期',
+  zcgMc: '暂存柜',
+  cctj: '存储条件',
+  ccwz: '存储位置',
+  sxr: '失效日',
+  pzrq: '配置日期',
+  plcz: '批量处置',
+  plsd: '批量锁定',
+  plgd: '批量归档',
 
-    plcz:'批量处置',
-    plsd:'批量锁定',
-    plgd:'批量归档',
+  cz: '处置',
+  sjczfs: '试剂处置方式',
+  czl: '处置量',
+  yuanyin: '原因',
+  lock: '锁定',
+  unlock: '解锁',
+  detail: '详情',
+  guidang: '归档',
+  jiedang: '解档',
+  jieyue: '借阅',
+  guihuan: '归还',
+  fafang: '发放',
+  ysff: '钥匙发放',
+  czrq: '处置容器',
+  czyj: '处置药剂',
+  xgkc: '修改库存',
+  shxgkc: '审核修改库存',
+  shbj: '审核编辑',
 
-    cz: '处置',
-    sjczfs: '试剂处置方式',
-    czl: '处置量',
-    yuanyin:'原因',
-    lock:'锁定',
-    unlock:'解锁',
-    detail:'详情',
-    guidang:'归档',
-    jiedang:'解档',
-    jieyue:'借阅',
-    guihuan:'归还',
-    fafang:'发放',
-    ysff:'钥匙发放',
-    czrq:'处置容器',
-    czyj:'处置药剂',
-    xgkc:'修改库存',
-    shxgkc:'审核修改库存',
-    shbj:'审核编辑',
+  ssbd: '所属表单',
+  bdsssy: '表单所属试验',
+  bdssr: '表单所属人',
+  bdssbm: '表单所属部门',
 
-}
\ No newline at end of file
+  tz: '试剂台账',
+  tz: '试剂台账',
+  qmr: '签名人',
+  czlx: '操作类型',
+  czl: '操作量',
+  bz: '备注/原因',
+  czsj: '操作时间',
+
+  jcgj: '稽查轨迹',
+}
diff --git a/src/lang/zh/business/resource/sj/sj.js b/src/lang/zh/business/resource/sj/sj.js
index f05c719..bc72a17 100644
--- a/src/lang/zh/business/resource/sj/sj.js
+++ b/src/lang/zh/business/resource/sj/sj.js
@@ -1,47 +1,60 @@
 export default {
-    sdts:'请确认是否锁定以下麻精药',
-    gdts:'请确认是否归档以下麻精药',
-    mc:'名称',
-    bh:'编号',
-    ssbm: '所属部门',
-    gxsjk: '更新试剂库',
-    jyzt:'借阅状态',
-    zjzt:'制剂状态',
-    sxrq:'失效日期',
-    nd:'浓度/含量/纯度',
-    kcl:'库存量',
-    gg: '规格',
-    ly: '来源',
-    sssy: '所属试验',
-    ph: '批号',
-    yxzq: '有效周期',
-    zcgMc:'暂存柜',
-    cctj:'存储条件',
-    ccwz:'存储位置',
+  sdts: '请确认是否锁定以下麻精药',
+  gdts: '请确认是否归档以下麻精药',
+  mc: '名称',
+  bh: '编号',
+  ssbm: '所属部门',
+  gxsjk: '更新试剂库',
+  jyzt: '借阅状态',
+  zjzt: '制剂状态',
+  sxrq: '失效日期',
+  nd: '浓度/含量/纯度',
+  kcl: '库存量',
+  gg: '规格',
+  ly: '来源',
+  sssy: '所属试验',
+  ph: '批号',
+  yxzq: '有效周期',
+  zcgMc: '暂存柜',
+  cctj: '存储条件',
+  ccwz: '存储位置',
+  sxr: '失效日',
+  pzrq: '配置日期',
+  plcz: '批量处置',
+  plsd: '批量锁定',
+  plgd: '批量归档',
 
-    plcz:'批量处置',
-    plsd:'批量锁定',
-    plgd:'批量归档',
+  cz: '处置',
+  sjczfs: '试剂处置方式',
+  czl: '处置量',
+  yuanyin: '原因',
+  lock: '锁定',
+  unlock: '解锁',
+  detail: '详情',
+  guidang: '归档',
+  jiedang: '解档',
+  jieyue: '借阅',
+  jieyuesj: '借阅时间',
+  guihuan: '归还',
+  fafang: '发放',
+  ysff: '钥匙发放',
+  czrq: '处置容器',
+  czyj: '处置药剂',
+  xgkc: '修改库存',
+  shxgkc: '审核修改库存',
+  shbj: '审核编辑',
 
-    cz: '处置',
-    sjczfs: '试剂处置方式',
-    czl: '处置量',
-    yuanyin:'原因',
-    lock:'锁定',
-    unlock:'解锁',
-    detail:'详情',
-    guidang:'归档',
-    jiedang:'解档',
-    jieyue:'借阅',
-    jieyuesj: '借阅时间',
-    guihuan:'归还',
-    fafang:'发放',
-    ysff:'钥匙发放',
-    czrq:'处置容器',
-    czyj:'处置药剂',
-    xgkc:'修改库存',
-    shxgkc:'审核修改库存',
-    shbj:'审核编辑',
+  ssbd: '所属表单',
+  bdsssy: '表单所属试验',
+  bdssr: '表单所属人',
+  bdssbm: '表单所属部门',
 
+  tz: '试剂台账',
+  qmr: '签名人',
+  czlx: '操作类型',
+  czl: '操作量',
+  bz: '备注/原因',
+  czsj: '操作时间',
 
-}
\ No newline at end of file
+  jcgj: '稽查轨迹',
+}
diff --git a/src/views/business/resource/sj/comps/Cz.vue b/src/views/business/resource/sj/comps/Cz.vue
index 10aa88e..b0a8af3 100644
--- a/src/views/business/resource/sj/comps/Cz.vue
+++ b/src/views/business/resource/sj/comps/Cz.vue
@@ -31,7 +31,7 @@ G<template>
           <el-row>
             <el-col :span="24">
               <el-form-item :label="$t('page.business.resource.sj.czl')" prop="czl">
-                <el-input type="number" v-model="form.czl" maxlength="50" :placeholder="$t('form.placeholderInput')" >
+                <el-input type="number" v-model="form.czl" maxlength="50" :placeholder="$t('form.placeholderInput')">
                   <template slot="append">{{ form.kcdw }}</template>
                 </el-input>
               </el-form-item>
@@ -40,7 +40,8 @@ G<template>
           <el-row>
             <el-col :span="24">
               <el-form-item :label="$t('page.business.resource.sj.yuanyin')" prop="remark">
-                <el-input type="textarea" :rows="2" v-model="form.remark" maxlength="500" :placeholder="$t('form.placeholderInput')" />
+                <el-input type="textarea" :rows="2" v-model="form.remark" maxlength="500"
+                  :placeholder="$t('form.placeholderInput')" />
               </el-form-item>
             </el-col>
           </el-row>
@@ -64,7 +65,8 @@ G<template>
         <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-input type="password" v-model="form.qmrmm" maxlength="20"
+                :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -78,7 +80,7 @@ G<template>
 </template>
 
 <script>
-import { mjy_jd, mjy_jdBatch } from "@/api/business/mjy/mjy"
+import { sj_cz } from "@/api/business/sj/sj"
 import { mapGetters } from 'vuex'
 import SelectList from "./SelectList";
 import BusinessSelect from '@/views/business/comps/select/BusinessSelect';
@@ -117,13 +119,6 @@ export default {
   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
     },
@@ -153,18 +148,10 @@ export default {
     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')
-            })
-          }
-
+          sj_cz(this.form).then(response => {
+            this.open = false
+            this.$emit('callback')
+          })
         }
       })
     }
diff --git a/src/views/business/resource/sj/comps/CzBatch.vue b/src/views/business/resource/sj/comps/CzBatch.vue
index e1143fe..c99bceb 100644
--- a/src/views/business/resource/sj/comps/CzBatch.vue
+++ b/src/views/business/resource/sj/comps/CzBatch.vue
@@ -70,7 +70,7 @@ G<template>
 </template>
 
 <script>
-import { mjy_jd, mjy_jdBatch } from "@/api/business/mjy/mjy"
+import { sj_plcz } from "@/api/business/sj/sj"
 import { mapGetters } from 'vuex'
 import SelectList from "./SelectList";
 import BusinessSelect from '@/views/business/comps/select/BusinessSelect';
@@ -109,6 +109,17 @@ export default {
   created() {
   },
   methods: {
+    // 删除
+    handleSc(row) {
+      const that = this
+      this.$modal.confirm(this.$t('form.confirmDelete')).then(() => {
+        const _index = _.findIndex(that.selectList, function (o) { return o.id === row.id })
+        if (_index > -1) {
+          that.selectList.splice(_index, 1)
+          that.form.ids = that.selectList.map(item => item.id)
+        }
+      }).catch(() => { })
+    },
     showBatch(val) {
       this.reset()
       this.isBatch = true
@@ -134,18 +145,10 @@ export default {
     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')
-            })
-          }
-
+          sj_plcz(this.form).then(response => {
+            this.open = false
+            this.$emit('callback')
+          })
         }
       })
     }
diff --git a/src/views/business/resource/sj/comps/Gd.vue b/src/views/business/resource/sj/comps/Gd.vue
index 3cb847d..559ad16 100644
--- a/src/views/business/resource/sj/comps/Gd.vue
+++ b/src/views/business/resource/sj/comps/Gd.vue
@@ -45,7 +45,7 @@ G<template>
 </template>
 
 <script>
-import { mjy_gd, mjy_gdBatch } from "@/api/business/mjy/mjy"
+import { sj_gd, sj_plgd } from "@/api/business/sj/sj"
 import { mapGetters } from 'vuex'
 import SelectList from "./SelectList";
 
@@ -111,12 +111,12 @@ export default {
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.isBatch) {
-            mjy_gdBatch(this.form).then(response => {
+            sj_plgd(this.form).then(response => {
               this.open = false
               this.$emit('callback')
             })
           } else {
-            mjy_gd(this.form).then(response => {
+            sj_gd(this.form).then(response => {
               this.open = false
               this.$emit('callback')
             })
diff --git a/src/views/business/resource/sj/comps/Js.vue b/src/views/business/resource/sj/comps/Js.vue
index b620016..99e66f1 100644
--- a/src/views/business/resource/sj/comps/Js.vue
+++ b/src/views/business/resource/sj/comps/Js.vue
@@ -30,8 +30,8 @@ G<template>
         </el-row>
         <el-row>
           <el-col :span="24">
-            <el-form-item :label="$t('form.password')" prop="sdrmm">
-              <el-input type="text" v-model="form.sdrmm" maxlength="20" :placeholder="$t('form.placeholderInput')" />
+            <el-form-item :label="$t('form.password')" prop="qmrmm">
+              <el-input type="text" v-model="form.qmrmm" maxlength="20" :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -45,7 +45,7 @@ G<template>
 </template>
 
 <script>
-import { mjy_js } from "@/api/business/mjy/mjy"
+import { sj_js } from "@/api/business/sj/sj"
 import { mapGetters } from 'vuex'
 
 export default {
@@ -55,7 +55,7 @@ export default {
       open: false,
       form: {},
       rules: {
-        sdrmm: [{
+        qmrmm: [{
           required: true,
           message: ' ',
           trigger: 'blur'
@@ -95,7 +95,7 @@ export default {
     save() {
       this.$refs["form"].validate(valid => {
         if (valid) {
-            mjy_js(this.form).then(response => {
+            sj_js(this.form).then(response => {
               this.open = false
               this.$emit('callback')
             })
diff --git a/src/views/business/resource/sj/comps/Sd.vue b/src/views/business/resource/sj/comps/Sd.vue
index b2f1997..d9f9606 100644
--- a/src/views/business/resource/sj/comps/Sd.vue
+++ b/src/views/business/resource/sj/comps/Sd.vue
@@ -30,8 +30,8 @@ G<template>
         </el-row>
         <el-row>
           <el-col :span="24">
-            <el-form-item :label="$t('form.password')" prop="sdrmm">
-              <el-input type="text" v-model="form.sdrmm" maxlength="20" :placeholder="$t('form.placeholderInput')" />
+            <el-form-item :label="$t('form.password')" prop="qmrmm">
+              <el-input type="text" v-model="form.qmrmm" maxlength="20" :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -45,7 +45,7 @@ G<template>
 </template>
 
 <script>
-import { mjy_sd, mjy_sdBatch } from "@/api/business/mjy/mjy"
+import { sj_sd, sj_plsd } from "@/api/business/sj/sj"
 import { mapGetters } from 'vuex'
 import SelectList from "./SelectList";
 
@@ -60,7 +60,7 @@ export default {
       open: false,
       form: {},
       rules: {
-        sdrmm: [{
+        qmrmm: [{
           required: true,
           message: ' ',
           trigger: 'blur'
@@ -111,12 +111,12 @@ export default {
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.isBatch) {
-            mjy_sdBatch(this.form).then(response => {
+            sj_plsd(this.form).then(response => {
               this.open = false
               this.$emit('callback')
             })
           } else {
-            mjy_sd(this.form).then(response => {
+            sj_sd(this.form).then(response => {
               this.open = false
               this.$emit('callback')
             })
diff --git a/src/views/business/resource/sj/comps/Xgkc.vue b/src/views/business/resource/sj/comps/Xgkc.vue
index 537bbf0..f53447c 100644
--- a/src/views/business/resource/sj/comps/Xgkc.vue
+++ b/src/views/business/resource/sj/comps/Xgkc.vue
@@ -56,7 +56,7 @@ G<template>
 </template>
 
 <script>
-import { sjkc_xgkc } from "@/api/business/sj/sjkc"
+import { sj_xgkc } from "@/api/business/sj/sj"
 import { mapGetters } from 'vuex'
 import SelectList from "./SelectList";
 import BusinessSelectVue from '@/views/business/comps/select/BusinessSelect';
@@ -130,7 +130,7 @@ export default {
     save() {
       this.$refs["form"].validate(valid => {
         if (valid) {
-          sjkc_xgkc(this.form).then(response => {
+          sj_xgkc(this.form).then(response => {
             this.open = false
             this.$emit('callback')
           })
diff --git a/src/views/business/resource/sj/comps/Xq.vue b/src/views/business/resource/sj/comps/Xq.vue
index 33034e1..61aa156 100644
--- a/src/views/business/resource/sj/comps/Xq.vue
+++ b/src/views/business/resource/sj/comps/Xq.vue
@@ -1,97 +1,227 @@
-<template>
+G<template>
   <!-- 详情 -->
-  <div class="detail-container">
-    <div class="header">
-      <div @click="cancel" class="detail-cancel"><i class="el-icon-arrow-left"></i></div>
-      <div>
-        <el-button ><div>{{ $t('form.export') }}</div></el-button>
-      </div>
-    </div>
-    <div class="detail-title"><img src="@/assets/images/detail-title.png" >试剂详情<img src="@/assets/images/detail-title.png" ></img></div>
-    <div class="content">
-      <div class="content-title">
-        <div class="line"></div>
-        <div class="subtitle"> 基本信息</div>
+  <div v-show="open">
+    <div class="detail-container">
+      <div class="detail-top">
+        <div class="left-top">
+          <img src="@/assets/images/back.png" @click="cancel()" />
+          <div class="left-title"></div>
+        </div>
+        <div class="right-top">
+        <el-button @click="cancel()">{{$t('form.cancel')}}</el-button>
+          <el-button @click="exportExcel()">{{ $t('form.export') }}</el-button>
+        </div>
       </div>
-      <el-form ref="form" :model="form" :rules="rules" label-width="0px">
-        <div class="pal">
-          <div class="left">
-            <div class="left-title">{{ $t('page.business.zykgl.sj.mc') }}</div>
-            <el-form-item prop="qmyy">
-              <el-input type="text" :value="form.mc" maxlength="50" disabled
-                :placeholder="$t('form.placeholderInput')" />
-            </el-form-item>
+       <div class="detail-title"><img src="@/assets/images/detail-title.png" >{{ $t('page.business.resource.mjy.mjyxq') }}<img src="@/assets/images/detail-title.png" /></div>
+      <div class="detail-content">
+        <div class="content-left">
+          <div class="content-title">
+            <div class="line"></div>
+            <div class="subtitle"> 基本信息</div>
           </div>
-          <div class="right">
-           <div  class="right-title">{{ $t('page.business.zykgl.sj.bh') }}</div>
-            <el-form-item prop="qmyy">
-              <el-input type="text" :value="form.bh" maxlength="50" disabled
-                :placeholder="$t('form.placeholderInput')" />
-            </el-form-item>
+          <div class="pal">
+            <div class="left">
+              <div class="left-title">{{ $t('page.business.resource.sj.mc') }}</div>
+              <el-input type="text" :value="form.mc" maxlength="50" disabled />
+            </div>
+            <div class="right">
+              <div class="right-title">{{ $t('page.business.resource.sj.bh') }}</div>
+              <el-input type="text" :value="form.bh" maxlength="50" disabled />
+            </div>
           </div>
-        </div>
-        <div class="pal">
-          <div class="left">
-            <div class="left-title">{{ $t('page.business.zykgl.sj.ph') }}</div>
-            <el-form-item prop="qmyy">
-              <el-input type="text" :value="form.ph" maxlength="50" disabled
-                :placeholder="$t('form.placeholderInput')" />
-            </el-form-item>
+          <div class="pal">
+            <div class="left">
+              <div class="left-title">{{ $t('page.business.resource.sj.ph') }}</div>
+              <el-input type="text" :value="form.ph" maxlength="50" disabled />
+            </div>
+            <div class="right">
+              <div class="right-title">{{ $t('page.business.resource.sj.gg') }}</div>
+              <el-input type="text" :value="form.gg" maxlength="50" disabled />
+            </div>
           </div>
-          <div class="right">
-           <div  class="right-title">{{ $t('page.business.zykgl.sj.gg') }}</div>
-            <el-form-item prop="qmyy">
-              <el-input type="text" :value="form.gg" maxlength="50" disabled
-                :placeholder="$t('form.placeholderInput')" />
-            </el-form-item>
+          <div class="pal">
+            <div class="left">
+              <div class="left-title">{{ $t('page.business.resource.sj.nd') }}</div>
+              <el-input type="text" :value="form.nd" maxlength="50" disabled> <template slot="append">{{
+                form.nddw }}</template>
+              </el-input>
+            </div>
+            <div class="right">
+              <div class="right-title">{{ $t('page.business.resource.sj.kcl') }}</div>
+              <el-input type="text" :value="form.kc" maxlength="50" disabled> <template slot="append">{{
+                form.kcdw }}</template> </el-input>
+            </div>
           </div>
-        </div>
-        <div class="pal">
-          <div class="left">
-            <div class="left-title">{{ $t('page.business.zykgl.sj.ph') }}</div>
-            <el-form-item prop="qmyy">
-              <el-input type="text" :value="form.ph" maxlength="50" disabled
-                :placeholder="$t('form.placeholderInput')" />
-            </el-form-item>
+          <div class="pal">
+            <div class="left">
+              <div class="left-title">{{ $t('page.business.resource.sj.ly') }}</div>
+              <el-input type="text" :value="form.ly" maxlength="50" disabled />
+            </div>
+            <div class="right">
+              <div class="right-title">{{ $t('page.business.resource.sj.cctj') }}</div>
+              <el-input type="text" :value="form.cctj" maxlength="50" disabled />
+            </div>
+          </div>
+          <div class="pal">
+            <div class="left">
+              <div class="left-title">{{ $t('page.business.resource.sj.ccwz') }}</div>
+              <el-input type="text" :value="form.ccwz" maxlength="50" disabled />
+            </div>
+            <div class="right">
+              <div class="right-title">{{ $t('page.business.resource.sj.yxzq') }}</div>
+              <el-input type="text" :value="form.yxzq" maxlength="50" disabled />
+            </div>
+          </div>
+          <div class="pal">
+            <div class="left">
+              <div class="left-title">{{ $t('page.business.resource.sj.sxr') }}</div>
+              <el-input type="text" :value="form.sxr" maxlength="50" disabled />
+            </div>
+            <div class="right">
+              <div class="right-title">{{ $t('page.business.resource.sj.pzrq') }}</div>
+              <el-input type="text" :value="form.pzrq" maxlength="50" disabled />
+            </div>
+          </div>
+          <div class="content-title">
+            <div class="line"></div>
+            <div class="subtitle"> 表单信息</div>
+          </div>
+          <div class="pal">
+            <div class="left">
+              <div class="left-title">{{ $t('page.business.resource.sj.ssbd') }}</div>
+              <el-input type="text" :value="form.xmMc" maxlength="50" disabled />
+            </div>
+            <div class="right">
+              <div class="right-title">{{ $t('page.business.resource.sj.bdsssy') }}</div>
+              <el-input type="text" :value="form.bdMc" maxlength="50" disabled />
+            </div>
+          </div>
+          <div class="pal">
+            <div class="left">
+              <div class="left-title">{{ $t('page.business.resource.sj.bdssr') }}</div>
+              <el-input type="text" :value="form.xmMc" maxlength="50" disabled />
+            </div>
+            <div class="right">
+              <div class="right-title">{{ $t('page.business.resource.sj.bdssbm') }}</div>
+              <el-input type="text" :value="form.bdMc" maxlength="50" disabled />
+            </div>
+          </div>
+          <div class="content-title">
+            <div class="line"></div>
+            <div class="subtitle"> {{ $t('page.business.resource.sj.tz') }}</div>
           </div>
-          <div class="right">
-           <div  class="right-title">{{ $t('page.business.zykgl.sj.gg') }}</div>
-            <el-form-item prop="qmyy">
-              <el-input type="text" :value="form.gg" maxlength="50" disabled
-                :placeholder="$t('form.placeholderInput')" />
-            </el-form-item>
+          <div class="pal">
+            <el-table :data="tzList" v-loading="loadingTz">
+              <el-table-column :label="$t('page.business.resource.sj.qmr')" align="center" prop="qmrMc"
+                :show-overflow-tooltip="true" />
+              <el-table-column :label="$t('page.business.resource.sj.czlx')" align="center" prop="qmyy"
+                :show-overflow-tooltip="true">
+              </el-table-column>
+              <el-table-column :label="$t('page.business.resource.sj.czl')" align="center"
+                :show-overflow-tooltip="true">
+                <template slot-scope="scope">
+                  {{ scope.row.czl }}{{ scope.row.czldw }}
+                </template>
+              </el-table-column>
+              <el-table-column :label="$t('page.business.resource.sj.bz')" align="center" prop="remark"
+                :show-overflow-tooltip="true" />
+              <el-table-column :label="$t('page.business.resource.sj.czsj')" align="center" prop="createTime"
+                width="150px" />
+            </el-table>
+          </div>
+          <div class="pal">
+            <pagination v-show="totalTz > 0" :total="totalTz" :page.sync="queryParamstZ.pageNum"
+              :limit.sync="queryParamstZ.pageSize" @pagination="getTzList" />
           </div>
         </div>
-      </el-form>
+        <div class="content-right">
+          <div class="content-title">
+            <div class="line"></div>
+            <div class="subtitle"> {{ $t('page.business.resource.sj.jcgj') }}</div>
+          </div>
+          <jcgjList ref="jcgjList" @handleQuery="jcgjListHandleQuery" />
 
+          <pagination v-show="jcgjTotal > 0" small layout="prev, pager, next" :total="jcgjTotal"
+            @pagination="getJjcgjList" />
+        </div>
+      </div>
     </div>
   </div>
 </template>
 
 <script>
-import { mjy_info } from "@/api/business/mjy/mjy"
+import { sj_info, tzList, jcgjList } from "@/api/business/sj/sj"
+import JcgjList from "@/views/business/comps/common/JcgjList";
 
 export default {
-  name: "MjyXq",
+  name: "SjXq",
+  components: { JcgjList },
   data() {
     return {
       form: {},
-      rules: {
+      tzList: [],
+      totalTz: 0,
+      loadingTz: true,
+      open: false,
+      queryParamstZ: {
+        mjyId: null,
+        pageNum: 1,
+        pageSize: 10
+      },
+      jcgjTotal: 0,
+      jcgjList: [],
+      queryJcgjParams: {
+        pageNum: 1,
+        mjyId: null,
+        pageSize: 10,
       }
     }
   },
   created() {
   },
   methods: {
+    exportExcel(){
+      alert('todo')
+    },
+    jcgjListHandleQuery(val) {
+      this.$modal.loading()
+      jcgjList(_.merge({}, this.queryJcgjParams, val)).then(response => {
+        this.jcgjList = response.rows
+        this.jcgjTotal = response.total
+        this.$refs.jcgjList.init(this.jcgjList)
+        this.$modal.closeLoading()
+      })
+    },
+    getJjcgjList() {
+      jcgjList(this.queryJcgjParams).then(response => {
+        this.jcgjList = response.rows
+        this.jcgjTotal = response.total
+        this.$refs.jcgjList.init(this.jcgjList)
+        this.$modal.closeLoading()
+      })
+    },
     cancel() {
-      this.$emit('cancel')
+      this.open = false
+      this.$emit('callback')
+    },
+    getTzList() {
+      this.loadingTz = true
+      tzList(this.queryParamstZ).then(response => {
+        this.tzList = response.rows
+        this.totalTz = response.total
+        this.loadingTz = false
+        this.getJjcgjList()
+      })
     },
     show(row) {
-      mjy_info({ id: row.id }).then(response => {
+      this.$modal.loading()
+      this.queryParamstZ.sjId = row.id
+      this.queryJcgjParams.sjId = row.id
+      sj_info({ id: row.id }).then(response => {
         this.form = response.data
-        this.open = false
+        this.getTzList()
+        this.open = true
       })
-      this.open = true
     }
   }
 }
diff --git a/src/views/business/resource/sj/list.vue b/src/views/business/resource/sj/list.vue
index 8e64dc5..54a5264 100644
--- a/src/views/business/resource/sj/list.vue
+++ b/src/views/business/resource/sj/list.vue
@@ -1,14 +1,9 @@
 <!-- 试剂管理 -->
 <template>
   <div>
-    <!-- 详情 -->
-    <template v-if="showDetail">
-      <Xq ref="Xq" @cancel="cancelXq" />
-    </template>
-
     <!-- 列表 -->
-    <template v-else>
-      <div class="app-container sj">
+    <div>
+      <div class="app-container sj" v-show="!showDetail">
         <el-form :model="queryParams" ref="queryForm" class="search-area" :inline="true">
           <!-- 名称 -->
           <el-form-item :label="$t('page.business.resource.sj.mc') + '：'">
@@ -177,6 +172,8 @@
         <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
           :limit.sync="queryParams.pageSize" @pagination="getList" />
       </div>
+      <!-- 详情 -->
+      <Xq v-show="showDetail" key="Xq" ref="Xq" @callback="closeXq" />
       <!-- 锁定 -->
       <Sd ref="Sd" @callback="handleQuery" />
       <!-- 解锁 -->
@@ -195,12 +192,12 @@
       <Cz ref="Cz" @callback="handleQuery" />
       <!-- 批量处置 -->
       <CzBatch ref="CzBatch" />
-    </template>
+    </div>
   </div>
 </template>
 
 <script>
-import { sjkc_list } from "@/api/business/sj/sjkc"
+import { sj_list } from "@/api/business/sj/sj"
 import Sd from "./comps/Sd";
 import Js from "./comps/Js";
 import Gd from "./comps/Gd";
@@ -277,9 +274,15 @@ export default {
     },
     //详情
     handleXq(row) {
-      this.showDetail = true
+      this.showDetail=true
+      this.$emit('showDetail',this.showDetail)
       this.$refs.Xq.show(row)
     },
+    closeXq(){
+      this.showDetail=false
+      this.$emit('showDetail',this.showDetail)
+      this.handleQuery()
+    },
     //批量解锁
     handlePljs() {
       this.$refs.Js.showBatch(this.selectList)
@@ -318,7 +321,7 @@ export default {
         this.queryParams.endDate = ''
       }
       this.loading = true
-      sjkc_list(this.queryParams).then(response => {
+      sj_list(this.queryParams).then(response => {
         this.list = response.rows
         this.total = response.total
         this.loading = false