diff --git a/src/api/business/sj/sjkc.js b/src/api/business/sj/sjkc.js
new file mode 100644
index 0000000..1607cbc
--- /dev/null
+++ b/src/api/business/sj/sjkc.js
@@ -0,0 +1,37 @@
+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
new file mode 100644
index 0000000..e0645c6
--- /dev/null
+++ b/src/api/business/sj/sjkcJcgj.js
@@ -0,0 +1,37 @@
+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/api/business/yq/yq.js b/src/api/business/yq/yq.js
index 1fc1fa1..d4718b2 100644
--- a/src/api/business/yq/yq.js
+++ b/src/api/business/yq/yq.js
@@ -27,11 +27,10 @@ export function yq_save(data) {
   })
 }
 
-// 删除仪器管理
-export function yq_delete(data) {
-  return request({
-    url: '/system/business/yq/delete',
-    method: 'post',
-    data: data
+export function yqJcgj_list(query) {
+return request({
+    url: '/system/business/yq/jcgj/list',
+    method: 'get',
+    params: query
   })
 }
\ No newline at end of file
diff --git a/src/views/business/resource/sj/comps/Cz.vue b/src/views/business/resource/sj/comps/Cz.vue
index 198b2c1..10aa88e 100644
--- a/src/views/business/resource/sj/comps/Cz.vue
+++ b/src/views/business/resource/sj/comps/Cz.vue
@@ -1,6 +1,6 @@
 G<template>
   <div>
-    <!-- 批量处置试剂弹窗 -->
+    <!-- 处置试剂弹窗 -->
     <el-dialog :title="$t('page.business.resource.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">
@@ -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="text" 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>
diff --git a/src/views/business/resource/sj/comps/Xgkc.vue b/src/views/business/resource/sj/comps/Xgkc.vue
index 69864e2..537bbf0 100644
--- a/src/views/business/resource/sj/comps/Xgkc.vue
+++ b/src/views/business/resource/sj/comps/Xgkc.vue
@@ -1,17 +1,19 @@
 G<template>
-  <div >
+  <div>
     <!-- 修改库存弹窗 -->
-    <el-dialog :title="$t('page.business.resource.sj.xgkc')" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false">
+    <el-dialog :title="$t('page.business.resource.sj.xgkc')" :visible.sync="open" width="500px" append-to-body
+      :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-row>
-            <el-col :span="24">
-              <el-form-item :label="$t('page.business.resource.sj.kcl')" prop="kcl">
-                <el-input type="text" v-model="form.kcl" maxlength="50" :placeholder="$t('form.placeholderInput')" >
-                  <template slot="append">{{ form.kcdw }}</template>
-                </el-input>
-              </el-form-item>
-            </el-col>
-          </el-row>
+          <el-col :span="18">
+            <el-form-item :label="$t('page.business.resource.sj.kcl')" prop="kc">
+              <el-input type="number" v-model="form.kc" maxlength="50" :placeholder="$t('form.placeholderInput')" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <BusinessSelectVue dictType="system_business_zldw" v-model="form.kcdw" />
+          </el-col>
+        </el-row>
         <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('form.qmyy')" prop="qmyy">
@@ -54,13 +56,13 @@ G<template>
 </template>
 
 <script>
-import { mjy_jd, mjy_jdBatch } from "@/api/business/mjy/mjy"
+import { sjkc_xgkc } from "@/api/business/sj/sjkc"
 import { mapGetters } from 'vuex'
 import SelectList from "./SelectList";
-
+import BusinessSelectVue from '@/views/business/comps/select/BusinessSelect';
 export default {
   name: "SjXgkc",
-  components: { SelectList },
+  components: { SelectList, BusinessSelectVue },
   data() {
     return {
       isBatch: false,
@@ -73,6 +75,11 @@ export default {
           required: true,
           message: ' ',
           trigger: 'blur'
+        }],
+        kc: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
         }]
       }
     }
@@ -102,7 +109,9 @@ export default {
         mc: null,
         bh: null,
         qmyy: '修改库存',
-        sdrmm: null
+        sdrmm: null,
+        kc: '',
+        kcdw: '',
       }
       this.resetForm("form")
     },
@@ -115,23 +124,16 @@ export default {
       this.form.mc = row.mc
       this.form.bh = row.bh
       this.form.kcdw = row.kcdw
+      this.form.kc = row.kc
       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')
-            })
-          }
-
+          sjkc_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 68304d3..33034e1 100644
--- a/src/views/business/resource/sj/comps/Xq.vue
+++ b/src/views/business/resource/sj/comps/Xq.vue
@@ -1,4 +1,4 @@
-G<template>
+<template>
   <!-- 详情 -->
   <div class="detail-container">
     <div class="header">
@@ -7,7 +7,7 @@ G<template>
         <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="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>
@@ -16,16 +16,48 @@ G<template>
       <el-form ref="form" :model="form" :rules="rules" label-width="0px">
         <div class="pal">
           <div class="left">
-            <div class="left-title">{{ $t('form.qmyy') }}</div>
+            <div class="left-title">{{ $t('page.business.zykgl.sj.mc') }}</div>
             <el-form-item prop="qmyy">
-              <el-input type="text" :value="form.qmyy" maxlength="50" disabled
+              <el-input type="text" :value="form.mc" maxlength="50" disabled
                 :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </div>
           <div class="right">
-           <div  class="right-title">{{ $t('form.qmyy') }}</div>
+           <div  class="right-title">{{ $t('page.business.zykgl.sj.bh') }}</div>
             <el-form-item prop="qmyy">
-              <el-input type="text" :value="form.qmyy" maxlength="50" disabled
+              <el-input type="text" :value="form.bh" maxlength="50" disabled
+                :placeholder="$t('form.placeholderInput')" />
+            </el-form-item>
+          </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>
+          <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>
+        </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>
+          <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>
diff --git a/src/views/business/resource/sj/list.vue b/src/views/business/resource/sj/list.vue
index a8f44f5..8e64dc5 100644
--- a/src/views/business/resource/sj/list.vue
+++ b/src/views/business/resource/sj/list.vue
@@ -20,7 +20,7 @@
             <el-input v-model="queryParams.bh" clearable @change="handleQuery"
               :placeholder="$t('form.placeholderInput')" />
           </el-form-item>
-           <!-- 所属部门 -->
+          <!-- 所属部门 -->
           <el-form-item :label="$t('page.business.resource.sj.ssbm') + '：'">
             <el-input v-model="queryParams.bm" clearable @change="handleQuery"
               :placeholder="$t('form.placeholderInput')" />
@@ -61,9 +61,8 @@
         <el-row :gutter="10" class="mb8">
           <el-col :span="1.5">
             <!-- 更新试剂库 -->
-            <el-button type="primary"
-              v-hasPermi="['business:resource:mjy:ff']">{{
-                $t('page.business.resource.sj.gxsjk') }}</el-button>
+            <el-button type="primary" v-hasPermi="['business:resource:mjy:ff']">{{
+              $t('page.business.resource.sj.gxsjk') }}</el-button>
           </el-col>
           <el-col :span="1.5">
             <!-- 批量处置 -->
@@ -133,41 +132,44 @@
             class-name="small-padding fixed-width" width="250px">
             <template slot-scope="scope">
               <!-- 详情 -->
-              <el-button type="text" @click="handleXq(scope.row)"
-                v-hasPermi="['business:resource:mjy:list']">{{
+              <template
+                v-if="scope.row.zjzt == 1 || scope.row.zjzt == 5 || (scope.row.zjzt == 9 && scope.row.jyzt == 5)">
+                <el-button type="text" @click="handleXq(scope.row)">{{
                   $t('page.business.resource.sj.detail') }}</el-button>
+              </template>
               <!-- 处置 -->
-              <el-button type="text" @click="handleCz(scope.row)"
-                v-hasPermi="['business:resource:mjy:czyj']">{{
+              <template v-if="scope.row.zjzt == 1">
+                <el-button type="text" @click="handleCz(scope.row)">{{
                   $t('page.business.resource.sj.cz') }}</el-button>
-              <!-- 编辑 -->
-              <el-button type="text" @click="handleBj(scope.row)"
-                v-hasPermi="['business:resource:mjy:bj']">{{
+              </template>
+              <template v-if="scope.row.zjzt == 1">
+                <!-- 编辑 -->
+                <el-button type="text" @click="handleBj(scope.row)">{{
                   $t('form.edit') }}</el-button>
-              <!-- 修改库存 -->
-              <el-button type="text" @click="handleXgkc(scope.row)"
-                v-hasPermi="['business:resource:mjy:xgkc']">{{
+                <!-- 修改库存 -->
+                <el-button type="text" @click="handleXgkc(scope.row)">{{
                   $t('page.business.resource.sj.xgkc') }}</el-button>
-              <!-- 锁定 -->
-              <el-button type="text" @click="handleSd(scope.row)"
-                v-hasPermi="['business:resource:mjy:sd']">{{
+                <!-- 锁定 -->
+                <el-button type="text" @click="handleSd(scope.row)">{{
                   $t('page.business.resource.sj.lock') }}</el-button>
-              <!-- 解锁 -->
-              <el-button type="text" @click="handleJs(scope.row)"
-                v-hasPermi="['business:resource:mjy:js']">{{
+              </template>
+              <template v-if="scope.row.zjzt == 5">
+                <!-- 解锁 -->
+                <el-button type="text" @click="handleJs(scope.row)">{{
                   $t('page.business.resource.sj.unlock') }}</el-button>
-              <!-- 归档 -->
-              <el-button type="text" @click="handleGd(scope.row)"
-                v-hasPermi="['business:resource:mjy:gd']">{{
+                <!-- 归档 -->
+                <el-button type="text" @click="handleGd(scope.row)">{{
                   $t('page.business.resource.sj.guidang') }}</el-button>
-              <!-- 解档 -->
-              <el-button type="text" @click="handleJd(scope.row)"
-                v-hasPermi="['business:resource:mjy:jd']">{{
+              </template>
+              <template v-if="scope.row.zjzt == 9 && scope.row.jyzt == 1">
+                <!-- 解档 -->
+                <el-button type="text" @click="handleJd(scope.row)">{{
                   $t('page.business.resource.sj.jiedang') }}</el-button>
-              <!-- 借阅 -->
-              <el-button type="text" @click="handleJy(scope.row)"
-                v-hasPermi="['business:resource:mjy:jy']">{{
+                <!-- 借阅 -->
+                <el-button type="text" @click="handleJy(scope.row)">{{
                   $t('page.business.resource.sj.jieyue') }}</el-button>
+              </template>
+
             </template>
           </el-table-column>
         </el-table>
@@ -189,20 +191,16 @@
       <Xgkc ref="Xgkc" @callback="handleQuery" />
       <!-- 借阅 -->
       <Jy ref="Jy" @callback="handleQuery" />
-      <!-- 归还 -->
-      <Gh ref="Gh" @callback="handleQuery" />
-      <!-- 发放 -->
-      <Ff ref="Ff" @callback="handleQuery" />
       <!-- 处置 -->
       <Cz ref="Cz" @callback="handleQuery" />
       <!-- 批量处置 -->
-      <CzBatch ref="CzBatch"/>
+      <CzBatch ref="CzBatch" />
     </template>
   </div>
 </template>
 
 <script>
-import { mjy_list } from "@/api/business/mjy/mjy"
+import { sjkc_list } from "@/api/business/sj/sjkc"
 import Sd from "./comps/Sd";
 import Js from "./comps/Js";
 import Gd from "./comps/Gd";
@@ -211,14 +209,12 @@ import Xq from "./comps/Xq";
 import Bj from "./comps/Bj";
 import Xgkc from "./comps/Xgkc";
 import Jy from "./comps/Jy";
-import Gh from "./comps/Gh";
-import Ff from "./comps/Ff";
 import Cz from "./comps/Cz";
 import CzBatch from "./comps/CzBatch";
 
 export default {
   name: "Sj",
-  components: { Sd, Js, Gd, Xq, Jd, Bj, Xgkc,  Jy, Gh, Cz, CzBatch, Ff },
+  components: { Sd, Js, Gd, Xq, Jd, Bj, Xgkc, Jy, Cz, CzBatch },
   data() {
     return {
       showDetail: false,
@@ -244,14 +240,14 @@ export default {
     }
   },
   created() {
-    this.getList()
+    this.handleQuery()
   },
   methods: {
     //处置
     handleCz(row) {
       this.$refs.Cz.show(row)
     },
-     //批量处置
+    //批量处置
     handlePlcz() {
       this.$refs.CzBatch.showBatch(this.selectList)
     },
@@ -322,7 +318,7 @@ export default {
         this.queryParams.endDate = ''
       }
       this.loading = true
-      mjy_list(this.queryParams).then(response => {
+      sjkc_list(this.queryParams).then(response => {
         this.list = response.rows
         this.total = response.total
         this.loading = false
diff --git a/src/views/business/resource/yq/comps/detail.vue b/src/views/business/resource/yq/comps/detail.vue
index a1c9214..dcf3ec5 100644
--- a/src/views/business/resource/yq/comps/detail.vue
+++ b/src/views/business/resource/yq/comps/detail.vue
@@ -59,13 +59,19 @@
         </el-row>
       </el-form>
       <el-table v-loading="loading" :data="qmList">
-        <el-table-column :label="$t('form.signer')" align="center" prop="bh" />
-        <el-table-column :label="$t('form.qmyy')" align="center" prop="xh" />
-        <el-table-column :label="$t('form.signTime')" align="center" prop="ly" />
-        <el-table-column :label="$t('page.business.resource.yq.xgnr')" align="center" prop="bmMc" />
+        <el-table-column :label="$t('form.signer')" align="center" prop="qmrMc" />
+        <el-table-column :label="$t('form.qmyy')" align="center" prop="jcmc" />
+        <el-table-column :label="$t('form.signTime')" align="center" prop="createTime" />
+        <el-table-column :label="$t('page.business.resource.yq.xgnr')" align="center">
+          <template slot-scope="scope">
+            <div v-for="(pitem, pindex) in scope.row.jcnrList" :key="pindex">
+              {{ pitem.name }}：{{ pitem.value }}
+            </div>
+          </template>
+        </el-table-column>
       </el-table>
       <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
-      @pagination="getList" />
+        @pagination="getList" />
       <div slot="footer" class="dialog-footer">
         <el-button @click="cancel">{{ $t('form.cancel') }}</el-button>
       </div>
@@ -74,12 +80,12 @@
 </template>
 
 <script>
-import { yq_info } from '@/api/business/yq/yq'
+import { yq_info, yqJcgj_list } from '@/api/business/yq/yq'
 export default {
   name: "YqDetail",
   data() {
     return {
-      loading: false,
+      loading: true,
       open: false,
       form: {},
       // 签名列表
@@ -89,6 +95,7 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
+        id: '',
       },
     }
   },
@@ -103,6 +110,20 @@ export default {
         this.form = response.data
         this.open = true
       })
+      this.queryParams.id = row.id
+      yqJcgj_list(this.queryParams).then((response) => {
+        this.qmList = response.rows
+        this.qmList.forEach(item => {
+          if(item.jcnr) {
+            item.jcnrList = JSON.parse(item.jcnr)
+            //item.jcnr = Object.entries(JSON.parse(item.jcnr)).map(([key, value]) => `${key}:${value}`).join('\r\n');
+          } else {
+            item.jcnrList = []
+          }
+        })
+        this.total = response.total
+        this.loading = false
+      })
     },
     getList() {
 
diff --git a/src/views/business/resource/yq/list.vue b/src/views/business/resource/yq/list.vue
index e4379fb..ce6f0a6 100644
--- a/src/views/business/resource/yq/list.vue
+++ b/src/views/business/resource/yq/list.vue
@@ -1,3 +1,4 @@
+<!-- 仪器列表 -->
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch">
@@ -88,8 +89,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item :label="$t('page.business.resource.yq.ssbm')" prop="bmId">
-              <el-input v-model="form.bmId" :placeholder="$t('form.placeholderSelect')" />
+            <el-form-item :label="$t('page.business.resource.yq.ssbm')" prop="bmMc">
+              <el-input v-model="form.bmMc" :placeholder="$t('form.placeholderSelect')" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -138,13 +139,14 @@
 </template>
 
 <script>
-import { yq_list, yq_info, delYq, yq_save } from '@/api/business/yq/yq'
+import { yq_list, yq_info, yq_save, yqJcgj_list } from '@/api/business/yq/yq'
 import YqDetail from './comps/detail'
 import BusinessSelect from '@/views/business/comps/select/BusinessSelect';
+import SelectDept from '@/views/business/comps/select/SelectDept';
 import { mapGetters } from 'vuex'
 export default {
   name: 'Yq',
-  components: { YqDetail, BusinessSelect },
+  components: { YqDetail, BusinessSelect, SelectDept },
 
   data() {
     return {
@@ -177,7 +179,7 @@ export default {
         xh: null,
         ly: null,
         jzrq: null,
-        bmId: null,
+        bmMc: null,
         wc: null
       },
       // 表单参数
@@ -205,7 +207,7 @@ export default {
         jzrq: [
           { required: true, message: this.$t('page.business.resource.yq.xcjzrq')+ this.$t('form.notEmpty'), trigger: "change" },
         ],
-        bmId: [
+        bmMc: [
           { required: true, message: this.$t('page.business.resource.yq.ssbm')+ this.$t('form.notEmpty'), trigger: "change" },
         ],
         wc: [
@@ -301,30 +303,6 @@ export default {
         }
       })
     },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const ids = row.id || this.ids
-      this.$modal
-        .confirm('是否确认删除仪器管理编号为"' + ids + '"的数据项？')
-        .then(function () {
-          return delYq(ids)
-        })
-        .then(() => {
-          this.getList()
-          this.$modal.msgSuccess('删除成功')
-        })
-        .catch(() => { })
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      this.download(
-        'business/yq/export',
-        {
-          ...this.queryParams
-        },
-        `Yq_${new Date().getTime()}.xlsx`
-      )
-    }
   }
 }
 </script>