From 9c5170b34c7cc5749b783098f6ba308995492f3a Mon Sep 17 00:00:00 2001
From: "15881625488@163.com" <15881625488@163.com>
Date: Thu, 25 Dec 2025 21:12:28 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A[=E8=B5=84=E6=BA=90=E5=BA=93?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86][=E9=BA=BB=E7=B2=BE=E8=8D=AF=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=EF=BC=8C=E5=8F=91=E6=94=BE=E8=AE=B0=E5=BD=95]?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                                        |  82 +++--
 src/api/business/mjy/mjy.js                        |  13 +-
 src/api/business/mjy/mjyFfjl.js                    |  27 +-
 src/lang/zh/business/resource/mjy/mjy.js           |   1 +
 src/views/business/comps/common/JcgjList.vue       |  87 +++++
 src/views/business/resource/mjy/comps/ffjl/Gd.vue  |  16 +-
 src/views/business/resource/mjy/comps/ffjl/Jd.vue  |   8 +-
 src/views/business/resource/mjy/comps/ffjl/Jq.vue  | 123 +++++++
 src/views/business/resource/mjy/comps/ffjl/Js.vue  |   8 +-
 src/views/business/resource/mjy/comps/ffjl/Jy.vue  |  46 +--
 src/views/business/resource/mjy/comps/ffjl/Sd.vue  |   8 +-
 src/views/business/resource/mjy/comps/ffjl/Xq.vue  | 202 ++++++++++++
 src/views/business/resource/mjy/comps/ffjlList.vue | 367 +++++++++++----------
 src/views/business/resource/mjy/comps/mjy/Czrq.vue |   2 +-
 src/views/business/resource/mjy/comps/mjy/Czyj.vue |   2 +-
 src/views/business/resource/mjy/comps/mjy/Ff.vue   |   4 +-
 src/views/business/resource/mjy/comps/mjy/Gd.vue   |   8 +-
 src/views/business/resource/mjy/comps/mjy/Gh.vue   |   8 +-
 src/views/business/resource/mjy/comps/mjy/Jd.vue   |   8 +-
 src/views/business/resource/mjy/comps/mjy/Js.vue   |   8 +-
 src/views/business/resource/mjy/comps/mjy/Jy.vue   |   8 +-
 src/views/business/resource/mjy/comps/mjy/Sd.vue   |   8 +-
 .../business/resource/mjy/comps/mjy/SelectList.vue |  17 +
 src/views/business/resource/mjy/comps/mjy/Xq.vue   |  76 ++++-
 src/views/business/resource/mjy/comps/mjy/Ysff.vue |   4 +-
 src/views/business/resource/mjy/comps/mjyList.vue  | 122 ++++---
 src/views/business/resource/mjy/index.vue          |   4 +-
 27 files changed, 903 insertions(+), 364 deletions(-)
 create mode 100644 src/views/business/comps/common/JcgjList.vue
 create mode 100644 src/views/business/resource/mjy/comps/ffjl/Jq.vue
 create mode 100644 src/views/business/resource/mjy/comps/ffjl/Xq.vue

diff --git a/src/App.vue b/src/App.vue
index da86767..6bc8870 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -131,9 +131,11 @@ export default {
 .el-dialog__footer {
   box-shadow: 0 2px 12px 0 rgba(0, 0, 0, .1) !important;
 }
-.el-dialog__body{
+
+.el-dialog__body {
   padding: 10px 10px;
 }
+
 /*搜索区域样式 */
 .search-area {
   input {
@@ -150,32 +152,33 @@ export default {
   background: #ffffff !important;
   margin: 10px 10px;
 
-  .header {
-    height: 50px;
-    line-height: 50px;
+  .detail-top {
+    background: #fff;
+    padding: 10px 20px;
+    margin-bottom: 10px;
     display: flex;
+    flex-direction: row;
+    align-items: center;
     justify-content: space-between;
-    padding: 0px 10px 0px 0px;
     box-shadow: 0 2px 12px 0 rgba(0, 0, 0, .1);
+    .left-top {
+      flex-shrink: 0;
+      display: flex;
+      flex-direction: row;
+      align-items: center;
 
-    .detail-cancel {
-      width: 50px;
-      padding-left: 10px;
-      cursor: pointer;
-    }
-  }
+      img {
+        height: 16px;
+        margin-right: 20px;
+        cursor: pointer;
+      }
 
-  .detail-title {
-    line-height: 60px;
-    font-size: 16px;
-    font-weight: bold;
-    width: 100%;
-    margin-top: 10px;
-    display: flex;
-    justify-content: center;
+      .right-top {}
+
+    }
   }
 
-  .content {
+  .detail-content {
 
     display: flex;
     justify-content: space-between;
@@ -225,12 +228,14 @@ export default {
       display: flex;
       justify-content: space-between;
       margin: 10px 0px;
+
       .left {
         box-shadow: 0 2px 12px 0 rgba(0, 0, 0, .1);
         margin: 5px 5px 5px 0px;
         width: 50%;
         padding: 10px 10px;
         border-radius: 5px 5px;
+
         .left-title {
           height: 40px;
           line-height: 40px;
@@ -253,4 +258,41 @@ export default {
   }
 
 }
+
+/*稽查轨迹list */
+
+.jcgjList {
+  padding: 20px 0px;
+
+  .jcgjList-keywords {
+    width: 100%;
+  }
+
+  .jcgjList-jcgjlx {
+    height: 50px;
+    margin: 10px 0px;
+  }
+
+  .jcgjList-content {
+    width: 100%;
+  }
+
+  .jcgjList-title {
+    display: flex;
+    justify-content: space-between;
+    margin-top: -15px;
+
+    .jcgjList-jcmc {
+      font-size: 16px;
+      font-weight: bold;
+    }
+  }
+
+  .jcglList-jcnr {
+    line-height: 25x;
+    box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+    padding: 10px 10px;
+    margin-top: 10px;
+  }
+}
 </style>
diff --git a/src/api/business/mjy/mjy.js b/src/api/business/mjy/mjy.js
index 01f1038..9eceb81 100644
--- a/src/api/business/mjy/mjy.js
+++ b/src/api/business/mjy/mjy.js
@@ -1,6 +1,6 @@
 import request from '@/utils/request'
 
-// 查询麻精药列表
+// 列表
 export function list(query) {
   return request({
     url: '/system/business/mjy/list',
@@ -8,8 +8,15 @@ export function list(query) {
     params: query
   })
 }
-
-// 查询麻精药详情
+// 稽查轨迹列表
+export function jcgjList(query) {
+  return request({
+    url: '/system/business/mjy/jcgjList',
+    method: 'get',
+    params: query
+  })
+}
+// 详情
 export function info(query) {
   return request({
     url: '/system/business/mjy/info',
diff --git a/src/api/business/mjy/mjyFfjl.js b/src/api/business/mjy/mjyFfjl.js
index 7ea24c5..92fb274 100644
--- a/src/api/business/mjy/mjyFfjl.js
+++ b/src/api/business/mjy/mjyFfjl.js
@@ -1,6 +1,6 @@
 import request from '@/utils/request'
 
-// 查询麻精药发放记录列表
+// 列表
 export function list(query) {
   return request({
     url: '/system/business/mjyFfjl/list',
@@ -8,6 +8,23 @@ export function list(query) {
     params: query
   })
 }
+// 稽查轨迹列表
+export function jcgjList(query) {
+  return request({
+    url: '/system/business/mjyFfjl/jcgjList',
+    method: 'get',
+    params: query
+  })
+}
+
+// 详情
+export function info(query) {
+  return request({
+    url: '/system/business/mjyFfjl/info',
+    method: 'get',
+    params: query
+  })
+}
 // 解锁
 export function js(data) {
   return request({
@@ -63,4 +80,12 @@ export function plgd(data) {
     method: 'post',
     data: data
   })
+}
+//加签
+export function jq(data) {
+  return request({
+    url: '/system/business/mjyFfjl/jq',
+    method: 'post',
+    data: data
+  })
 }
\ No newline at end of file
diff --git a/src/lang/zh/business/resource/mjy/mjy.js b/src/lang/zh/business/resource/mjy/mjy.js
index 8b29daa..24130c4 100644
--- a/src/lang/zh/business/resource/mjy/mjy.js
+++ b/src/lang/zh/business/resource/mjy/mjy.js
@@ -76,6 +76,7 @@ export default {
     ccsj:'操作时间',
     cksj:'出库时间',
     rksj:'入库时间',
+    jiaqian:'加签',
 
   
   
diff --git a/src/views/business/comps/common/JcgjList.vue b/src/views/business/comps/common/JcgjList.vue
new file mode 100644
index 0000000..31a5fde
--- /dev/null
+++ b/src/views/business/comps/common/JcgjList.vue
@@ -0,0 +1,87 @@
+<template>
+  <div class="jcgjList">
+    <div class="jcgjList-keywords">
+      <el-input v-model="queryParams.jcmc" clearable :placeholder="$t('form.placeholderInput')">
+        <el-button slot="append" icon="el-icon-search" @click="handleQuery"></el-button>
+      </el-input>
+    </div>
+    <div class="jcgjList-jcgjlx">
+      <el-radio-group v-model="queryParams.jcgjlx" @change="handleQuery">
+        <el-radio-button :label="-1">全部</el-radio-button>
+        <el-radio-button :label="1">流程</el-radio-button>
+        <el-radio-button :label="3">编辑</el-radio-button>
+      </el-radio-group>
+    </div>
+    <div class="jcgjList-content">
+      <el-timeline style="margin-left: -30px;">
+      <el-timeline-item placement="top" v-for="(item, index) in list" :key="index"  :color="item.color">
+        <div class="jcgjList-title">
+          <div class="jcgjList-jcmc" :style="'color:' + item.color">{{ item.jcmc }}</div>
+          <div>{{ item.createTime }}</div>
+        </div>
+        <div class="jcglList-jcnr">
+          <div v-for="(pitem, pindex) in item.jcnrList" :key="pindex">
+            {{ pitem.name }}：{{ pitem.value }}
+          </div>
+        </div>
+      </el-timeline-item>
+    </el-timeline>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "JcgjList",
+  components: {},
+  data() {
+    return {
+      list: [],
+      queryParams: {
+        jcmc: '',
+        jcgjlx: -1
+      }
+    };
+  },
+  mounted() {
+    this.list=[]
+  },
+  methods: {
+    handleQuery() {
+      this.$emit('handleQuery',this.queryParams)
+    },
+    init(val) {
+      let that = this
+      this.list = that.paseData(val)
+    },
+    add(val) {
+      let that = this
+      this.list.push(...that.paseData(val));
+    },
+    paseData(val) {
+      let tmp = []
+      _.forEach(val, function (a) {
+        let item = a
+        try {
+          item.jcnrList = JSON.parse(a.jcnr)
+        } catch (e) {
+          item.jcnrList = []
+        }
+        // 稽查名称颜色：1：蓝色；3：红色；5：绿色；7：橙色 
+        if (a.jcgjlx == 1) {
+          item.color = '#409EFF'
+        }
+        else if (a.jcgjlx == 3) {
+          item.color = '#F56C6C'
+        } else if (a.jcgjlx == 5) {
+          item.color = '#67C23A'
+        } else if (a.jcgjlx == 7) {
+          item.color = '#E6A23C'
+        }
+        tmp.push(item)
+      })
+      return tmp
+    }
+  }
+};
+</script>
diff --git a/src/views/business/resource/mjy/comps/ffjl/Gd.vue b/src/views/business/resource/mjy/comps/ffjl/Gd.vue
index 6b36b46..755c382 100644
--- a/src/views/business/resource/mjy/comps/ffjl/Gd.vue
+++ b/src/views/business/resource/mjy/comps/ffjl/Gd.vue
@@ -1,17 +1,17 @@
 G<template>
   <div>
-    <!-- 归档弹窗 -->
-    <el-dialog :title="$t('page.business.zykgl.mjy.guidang')" :visible.sync="open" width="500px" append-to-body
+    <!-- 锁定弹窗 -->
+    <el-dialog :title="$t('page.business.zykgl.mjy.lock')" :visible.sync="open" width="500px" append-to-body
       :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
-        <div v-show="isBatch">
+        <div :style="isBatch ? 'display:block' : 'display:none'">
           <el-row style="margin:10px 0px;">
             <el-col :span="24">
               <SelectList :value="selectList" />
             </el-col>
           </el-row>
         </div>
-         <div v-show="!isBatch">
+         <div v-if="!isBatch">
           <el-row>
             <el-col :span="24">
               <el-form-item :label="$t('page.business.zykgl.mjy.mc')" prop="mc">
@@ -56,8 +56,8 @@ G<template>
         </el-row>
         <el-row>
           <el-col :span="24">
-            <el-form-item :label="$t('form.password')" prop="sdrmm">
-              <el-input type="password" v-model="form.sdrmm" maxlength="20" :placeholder="$t('form.placeholderInput')" />
+            <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>
@@ -86,7 +86,7 @@ export default {
       open: false,
       form: {},
       rules: {
-        sdrmm: [{
+        qmrmm: [{
           required: true,
           message: ' ',
           trigger: 'blur'
@@ -119,7 +119,7 @@ export default {
         mc: null,
         bh: null,
         qmyy: '申请归档',
-        sdrmm: null
+        qmrmm: null
       }
       this.resetForm("form")
     },
diff --git a/src/views/business/resource/mjy/comps/ffjl/Jd.vue b/src/views/business/resource/mjy/comps/ffjl/Jd.vue
index 581f66f..721bf9b 100644
--- a/src/views/business/resource/mjy/comps/ffjl/Jd.vue
+++ b/src/views/business/resource/mjy/comps/ffjl/Jd.vue
@@ -46,8 +46,8 @@ G<template>
         </el-row>
         <el-row>
           <el-col :span="24">
-            <el-form-item :label="$t('form.password')" prop="sdrmm">
-              <el-input type="password" v-model="form.sdrmm" maxlength="20" :placeholder="$t('form.placeholderInput')" />
+            <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>
@@ -74,7 +74,7 @@ export default {
       open: false,
       form: {},
       rules: {
-        sdrmm: [{
+        qmrmm: [{
           required: true,
           message: ' ',
           trigger: 'blur'
@@ -107,7 +107,7 @@ export default {
         mc: null,
         bh: null,
         qmyy: '申请解档',
-        sdrmm: null
+        qmrmm: null
       }
       this.resetForm("form")
     },
diff --git a/src/views/business/resource/mjy/comps/ffjl/Jq.vue b/src/views/business/resource/mjy/comps/ffjl/Jq.vue
new file mode 100644
index 0000000..287bca6
--- /dev/null
+++ b/src/views/business/resource/mjy/comps/ffjl/Jq.vue
@@ -0,0 +1,123 @@
+G<template>
+  <div >
+    <!-- 加签弹窗 -->
+    <el-dialog :title="$t('page.business.zykgl.mjy.jiaqian')" :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.zykgl.mjy.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.mjy.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('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.remark')" prop="remark">
+              <el-input type="textarea" v-model="form.remark" :rows="2" maxlength="500"
+                :placeholder="$t('form.placeholderInput')">
+              </el-input>
+            </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 { jq } from "@/api/business/mjy/mjyFfjl"
+import { mapGetters } from 'vuex'
+
+export default {
+  name: "Jq",
+  data() {
+    return {
+      open: false,
+      form: {},
+      rules: {
+        qmrmm: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }]
+      }
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'nickName'
+    ]),
+  },
+  created() {
+  },
+  methods: {
+    cancel() {
+      this.open = false
+    },
+    reset() {
+      this.form = {
+        id: null,
+        ids: null,
+        mc: null,
+        bh: null,
+        qmyy: '补充说明',
+        qmrmm: null
+      }
+      this.resetForm("form")
+    },
+    show(row) {
+      this.reset()
+      this.form.id = row.id
+      this.form.mc = row.mc
+      this.form.bh = row.bh
+      this.open = true
+    },
+    save() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+            jq(this.form).then(response => {
+              this.open = false
+              this.$emit('callback')
+            })
+        }
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/business/resource/mjy/comps/ffjl/Js.vue b/src/views/business/resource/mjy/comps/ffjl/Js.vue
index 1385ad0..c12fac8 100644
--- a/src/views/business/resource/mjy/comps/ffjl/Js.vue
+++ b/src/views/business/resource/mjy/comps/ffjl/Js.vue
@@ -46,8 +46,8 @@ G<template>
         </el-row>
         <el-row>
           <el-col :span="24">
-            <el-form-item :label="$t('form.password')" prop="sdrmm">
-              <el-input type="password" v-model="form.sdrmm" maxlength="20" :placeholder="$t('form.placeholderInput')" />
+            <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>
@@ -71,7 +71,7 @@ export default {
       open: false,
       form: {},
       rules: {
-        sdrmm: [{
+        qmrmm: [{
           required: true,
           message: ' ',
           trigger: 'blur'
@@ -97,7 +97,7 @@ export default {
         mc: null,
         bh: null,
         qmyy: '解锁发放记录',
-        sdrmm: null
+        qmrmm: null
       }
       this.resetForm("form")
     },
diff --git a/src/views/business/resource/mjy/comps/ffjl/Jy.vue b/src/views/business/resource/mjy/comps/ffjl/Jy.vue
index a4558b5..55ba82d 100644
--- a/src/views/business/resource/mjy/comps/ffjl/Jy.vue
+++ b/src/views/business/resource/mjy/comps/ffjl/Jy.vue
@@ -3,16 +3,6 @@ G<template>
     <!-- 借阅弹窗 -->
     <el-dialog :title="$t('page.business.zykgl.mjy.jieyue')" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
-        <div :style="isBatch ? 'display:block' : 'display:none'">
-           <el-alert :title="$t('page.business.zykgl.mjy.jdts') " type="error" :closable="false">
-          </el-alert>
-          <el-row style="margin:10px 0px;">
-            <el-col :span="24">
-              <SelectList :value="selectList"/>
-            </el-col>
-          </el-row>
-        </div>
-          <div v-if="!isBatch">
           <el-row>
             <el-col :span="24">
               <el-form-item :label="$t('page.business.zykgl.mjy.mc')" prop="mc">
@@ -29,7 +19,6 @@ G<template>
               </el-form-item>
             </el-col>
           </el-row>
-        </div>
         <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('form.qmyy')" prop="qmyy">
@@ -57,8 +46,8 @@ G<template>
         </el-row>
         <el-row>
           <el-col :span="24">
-            <el-form-item :label="$t('form.password')" prop="sdrmm">
-              <el-input type="password" v-model="form.sdrmm" maxlength="20" :placeholder="$t('form.placeholderInput')" />
+            <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>
@@ -72,22 +61,17 @@ G<template>
 </template>
 
 <script>
-import { jd, jdBatch } from "@/api/business/mjy/mjy"
+import { jy } from "@/api/business/mjy/mjyFfjl"
 import { mapGetters } from 'vuex'
-import SelectList from "./SelectList";
 
 export default {
   name: "Jy",
-  components: { SelectList },
   data() {
     return {
-      isBatch: false,
-      ids: [],
-      selectList: [],
       open: false,
       form: {},
       rules: {
-        sdrmm: [{
+        qmrmm: [{
           required: true,
           message: ' ',
           trigger: 'blur'
@@ -103,13 +87,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
     },
@@ -120,15 +97,12 @@ export default {
         mc: null,
         bh: null,
         qmyy: '申请借阅',
-        sdrmm: null
+        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
@@ -137,19 +111,13 @@ export default {
     save() {
       this.$refs["form"].validate(valid => {
         if (valid) {
-          if (this.isBatch) {
-            jdBatch(this.form).then(response => {
-              this.open = false
-              this.$emit('callback')
-            })
-          } else {
-            jd(this.form).then(response => {
+         
+            jy(this.form).then(response => {
               this.open = false
               this.$emit('callback')
             })
           }
 
-        }
       })
     }
   }
diff --git a/src/views/business/resource/mjy/comps/ffjl/Sd.vue b/src/views/business/resource/mjy/comps/ffjl/Sd.vue
index 9357b05..f873e23 100644
--- a/src/views/business/resource/mjy/comps/ffjl/Sd.vue
+++ b/src/views/business/resource/mjy/comps/ffjl/Sd.vue
@@ -56,8 +56,8 @@ G<template>
         </el-row>
         <el-row>
           <el-col :span="24">
-            <el-form-item :label="$t('form.password')" prop="sdrmm">
-              <el-input type="password" v-model="form.sdrmm" maxlength="20" :placeholder="$t('form.placeholderInput')" />
+            <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>
@@ -86,7 +86,7 @@ export default {
       open: false,
       form: {},
       rules: {
-        sdrmm: [{
+        qmrmm: [{
           required: true,
           message: ' ',
           trigger: 'blur'
@@ -119,7 +119,7 @@ export default {
         mc: null,
         bh: null,
         qmyy: '锁定发放记录',
-        sdrmm: null
+        qmrmm: null
       }
       this.resetForm("form")
     },
diff --git a/src/views/business/resource/mjy/comps/ffjl/Xq.vue b/src/views/business/resource/mjy/comps/ffjl/Xq.vue
new file mode 100644
index 0000000..88f284a
--- /dev/null
+++ b/src/views/business/resource/mjy/comps/ffjl/Xq.vue
@@ -0,0 +1,202 @@
+<template>
+  <!-- 详情 -->
+  <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="exportExcel()">{{ $t('form.export') }}</el-button>
+      </div>
+    </div>
+      <div class="detail-content">
+        <div class="content-left">
+          <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.zykgl.mjy.mc') }}</div>
+              <el-input type="text" :value="form.mc" maxlength="50" disabled />
+            </div>
+            <div class="right">
+              <div class="right-title">{{ $t('page.business.zykgl.mjy.bh') }}</div>
+              <el-input type="text" :value="form.bh" maxlength="50" disabled />
+            </div>
+          </div>
+          <div class="pal">
+            <div class="left">
+              <div class="left-title">{{ $t('page.business.zykgl.mjy.jlzt') }}</div>
+              <el-select v-model="form.jlzt" disabled style="width: 100%;">
+                <el-option :label="$t('page.business.zykgl.jlzt.wsd')" :value="1" />
+                <el-option :label="$t('page.business.zykgl.jlzt.ysd')" :value="3" />
+                <el-option :label="$t('page.business.zykgl.jlzt.dgd')" :value="5" />
+                <el-option :label="$t('page.business.zykgl.jlzt.gd')" :value="7" />
+                <el-option :label="$t('page.business.zykgl.jlzt.djd')" :value="9" />
+              </el-select>
+            </div>
+            <div class="right">
+              <div class="right-title">{{ $t('page.business.zykgl.mjy.jyzt') }}</div>
+              <el-select v-model="form.jyzt" disabled style="width: 100%;">
+                <el-option :label="$t('page.business.zykgl.jyzt.wjy')" :value="1" />
+                <el-option :label="$t('page.business.zykgl.jyzt.djy')" :value="3" />
+                <el-option :label="$t('page.business.zykgl.jyzt.jyz')" :value="5" />
+              </el-select>
+            </div>
+          </div>
+          <div class="pal">
+            <div class="left">
+              <div class="left-title">{{ $t('page.business.zykgl.mjy.zcg') }}</div>
+              <el-input type="text" :value="form.zcgMc" 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.zykgl.mjy.md') }}</div>
+              <el-input type="text" :value="form.mdMc" maxlength="50" disabled />
+            </div>
+            <div class="right">
+              <div class="right-title">{{ $t('page.business.zykgl.mjy.zytj') }}</div>
+              <el-input type="text" :value="form.ffzytj" maxlength="50" disabled />
+            </div>
+          </div>
+          <div class="pal">
+            <div class="left">
+              <div class="left-title">{{ $t('page.business.zykgl.mjy.cksj') }}</div>
+              <el-input type="text" :value="form.ffrq" maxlength="50" disabled />
+            </div>
+            <div class="right">
+              <div class="right-title">{{ $t('page.business.zykgl.mjy.ckjz') }}</div>
+              <el-input type="text" :value="form.ckl" maxlength="50" disabled> <template slot="append">{{ form.ckldw
+                  }}</template>
+              </el-input>
+            </div>
+          </div>
+          <div class="pal">
+            <div class="left">
+              <div class="left-title">{{ $t('page.business.zykgl.mjy.lqr1') }}</div>
+              <el-input type="text" :value="form.lqr1Mc" maxlength="50" disabled />
+            </div>
+            <div class="right">
+              <div class="right-title">{{ $t('page.business.zykgl.mjy.lqr2') }}</div>
+              <el-input type="text" :value="form.lqr2Mc" maxlength="50" disabled />
+            </div>
+          </div>
+          <div class="pal">
+            <div class="left">
+              <div class="left-title">{{ $t('page.business.zykgl.mjy.kgy1') }}</div>
+              <el-input type="text" :value="form.kgy1Mc" maxlength="50" disabled />
+            </div>
+            <div class="right">
+              <div class="right-title">{{ $t('page.business.zykgl.mjy.kgy2') }}</div>
+              <el-input type="text" :value="form.kgy2Mc" 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.zykgl.mjy.rksj') }}</div>
+              <el-input type="text" :value="form.ghrq" maxlength="50" disabled />
+            </div>
+            <div class="right">
+              <div class="right-title">{{ $t('page.business.zykgl.mjy.rkjz') }}</div>
+              <el-input type="text" :value="form.rkl" maxlength="50" disabled> <template slot="append">{{ form.rkldw
+                  }}</template>
+              </el-input>
+            </div>
+          </div>
+          <div class="pal">
+            <div class="left">
+              <div class="left-title">{{ $t('page.business.zykgl.mjy.syl') }}</div>
+              <el-input type="text" :value="form.syl" maxlength="50" disabled> <template slot="append">{{ form.syldw
+                  }}</template>
+              </el-input>
+            </div>
+            <div class="right">
+              <div class="right-title">{{ $t('page.business.zykgl.mjy.zytj') }}</div>
+              <el-input type="text" :value="form.ghzytj" maxlength="50" disabled />
+            </div>
+          </div>
+        </div>
+        <div class="content-right">
+          <div class="content-title">
+            <div class="line"></div>
+            <div class="subtitle"> 稽查轨迹日志</div>
+          </div>
+          <jcgjList ref="jcgjList" @handleQuery="jcgjListHandleQuery" />
+
+          <pagination v-show="jcgjTotal > 0" small layout="prev, pager, next" :total="jcgjTotal"
+            @pagination="getJjcgjList" />
+        </div>
+      </div>
+  </div>
+</template>
+
+<script>
+import { info, jcgjList } from "@/api/business/mjy/mjyFfjl"
+import JcgjList from "@/views/business/comps/common/JcgjList";
+
+export default {
+  name: "Xq",
+  components: { JcgjList },
+  data() {
+    return {
+      form: {},
+      jcgjTotal: 0,
+      jcgjList: [],
+      open: false,
+      queryJcgjParams: {
+        pageNum: 1,
+        ffjlId: null,
+        pageSize: 10,
+      }
+    }
+  },
+  created() {
+  },
+  methods: {
+    exportExcel(){
+      alert('todo')
+    },
+    cancel() {
+      this.open = false
+      this.$emit('callback')
+    },
+    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()
+      })
+    },
+    show(row) {
+      this.$modal.loading()
+      this.queryJcgjParams.ffjlId = row.id
+      info({ id: row.id }).then(response => {
+        this.form = response.data
+        this.open = true
+        this.getJjcgjList()
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/business/resource/mjy/comps/ffjlList.vue b/src/views/business/resource/mjy/comps/ffjlList.vue
index f929b04..c5b8cc5 100644
--- a/src/views/business/resource/mjy/comps/ffjlList.vue
+++ b/src/views/business/resource/mjy/comps/ffjlList.vue
@@ -1,189 +1,194 @@
 <template>
   <div>
-    <!-- 列表 -->
-    <div class="app-container">
-      <el-form :model="queryParams" ref="queryForm" class="search-area" :inline="true" label-width="88px">
-        <el-row>
-          <el-col :span="24">
-            <!-- 名称 -->
-            <el-form-item :label="$t('page.business.zykgl.mjy.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-input v-model="queryParams.bh" clearable @change="handleQuery"
-                :placeholder="$t('form.placeholderInput')" />
-            </el-form-item>
-            <!-- 目的 -->
-            <el-form-item :label="$t('page.business.zykgl.mjy.md') + '：'">
-              <el-input v-model="queryParams.mdId" clearable @change="handleQuery"
-                :placeholder="$t('form.placeholderInput')" />
-            </el-form-item>
-            <!-- 记录状态 -->
-            <el-form-item :label="$t('page.business.zykgl.mjy.jlzt') + '：'">
-              <el-select v-model="queryParams.jlzt" :placeholder="$t('form.placeholderSelect')" clearable
-                @change="handleQuery">
-                <el-option key="1" :label="$t('page.business.zykgl.jlzt.wsd')" :value="1" />
-                <el-option key="3" :label="$t('page.business.zykgl.jlzt.ysd')" :value="3" />
-                <el-option key="5" :label="$t('page.business.zykgl.jlzt.dgd')" :value="5" />
-                <el-option key="7" :label="$t('page.business.zykgl.jlzt.gd')" :value="7" />
-                <el-option key="9" :label="$t('page.business.zykgl.jlzt.djd')" :value="9" />
-              </el-select>
-            </el-form-item>
-            <!-- 借阅状态 -->
-            <el-form-item :label="$t('page.business.zykgl.mjy.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" />
-                <el-option key="3" :label="$t('page.business.zykgl.jyzt.djy')" :value="3" />
-                <el-option key="5" :label="$t('page.business.zykgl.jyzt.jyz')" :value="5" />
-              </el-select>
-            </el-form-item>
-            <el-form-item>
-              <el-button type="primary" icon="el-icon-search" @click="handleQuery">{{ $t('form.search') }}</el-button>
-              <el-button icon="el-icon-refresh" @click="resetQuery">{{ $t('form.reset') }}</el-button>
-            </el-form-item>
+    <div>
+      <!-- 列表 -->
+      <div class="app-container" v-show="!showDetail">
+        <el-form :model="queryParams" ref="queryForm" class="search-area" :inline="true" label-width="88px">
+          <el-row>
+            <el-col :span="24">
+              <!-- 名称 -->
+              <el-form-item :label="$t('page.business.zykgl.mjy.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-input v-model="queryParams.bh" clearable @change="handleQuery"
+                  :placeholder="$t('form.placeholderInput')" />
+              </el-form-item>
+              <!-- 目的 -->
+              <el-form-item :label="$t('page.business.zykgl.mjy.md') + '：'">
+                <el-input v-model="queryParams.mdId" clearable @change="handleQuery"
+                  :placeholder="$t('form.placeholderInput')" />
+              </el-form-item>
+              <!-- 记录状态 -->
+              <el-form-item :label="$t('page.business.zykgl.mjy.jlzt') + '：'">
+                <el-select v-model="queryParams.jlzt" :placeholder="$t('form.placeholderSelect')" clearable
+                  @change="handleQuery">
+                  <el-option :label="$t('page.business.zykgl.jlzt.wsd')" :value="1" />
+                  <el-option :label="$t('page.business.zykgl.jlzt.ysd')" :value="3" />
+                  <el-option :label="$t('page.business.zykgl.jlzt.dgd')" :value="5" />
+                  <el-option :label="$t('page.business.zykgl.jlzt.gd')" :value="7" />
+                  <el-option :label="$t('page.business.zykgl.jlzt.djd')" :value="9" />
+                </el-select>
+              </el-form-item>
+              <!-- 借阅状态 -->
+              <el-form-item :label="$t('page.business.zykgl.mjy.jyzt') + '：'">
+                <el-select v-model="queryParams.jyzt" :placeholder="$t('form.placeholderSelect')" clearable
+                  @change="handleQuery">
+                  <el-option :label="$t('page.business.zykgl.jyzt.wjy')" :value="1" />
+                  <el-option :label="$t('page.business.zykgl.jyzt.djy')" :value="3" />
+                  <el-option :label="$t('page.business.zykgl.jyzt.jyz')" :value="5" />
+                </el-select>
+              </el-form-item>
+              <el-form-item>
+                <el-button type="primary" icon="el-icon-search" @click="handleQuery">{{ $t('form.search') }}</el-button>
+                <el-button icon="el-icon-refresh" @click="resetQuery">{{ $t('form.reset') }}</el-button>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <!-- 出库日期 -->
+              <el-form-item :label="$t('page.business.zykgl.mjy.cksj') + '：'">
+                <el-date-picker v-model="daterangeCk" 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;" />
+              </el-form-item>
+              <!-- 入库日期 -->
+              <el-form-item :label="$t('page.business.zykgl.mjy.rksj') + '：'">
+                <el-date-picker v-model="daterangeRk" 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;" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <!-- 批量归档 -->
+            <el-button type="primary" :disabled="multiple" @click="handlePlgd"
+              v-hasPermi="['business:resource:mjy:ffjlgd']">{{
+                $t('page.business.zykgl.mjy.plgd') }}</el-button>
           </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="24">
-            <!-- 出库日期 -->
-            <el-form-item :label="$t('page.business.zykgl.mjy.cksj') + '：'">
-              <el-date-picker v-model="daterangeCk" 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;" />
-            </el-form-item>
-            <!-- 入库日期 -->
-            <el-form-item :label="$t('page.business.zykgl.mjy.rksj') + '：'">
-              <el-date-picker v-model="daterangeRk" 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;" />
-            </el-form-item>
+          <el-col :span="1.5">
+            <!-- 批量锁定 -->
+            <el-button type="primary" :disabled="multiple" @click="handlePlsd"
+              v-hasPermi="['business:resource:mjy:ffjlsd']">{{
+                $t('page.business.zykgl.mjy.plsd') }}</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <!-- 导出 -->
+            <el-button type="primary" :disabled="multiple" @click="handleDc"
+              v-hasPermi="['business:resource:mjy:ffjldc']">{{
+                $t('form.export') }}</el-button>
           </el-col>
         </el-row>
-      </el-form>
-      <el-row :gutter="10" class="mb8">
-        <el-col :span="1.5">
-          <!-- 批量归档 -->
-          <el-button type="primary" :disabled="multiple" @click="handlePlgd"
-            v-hasPermi="['business:resource:mjy:ffjlgd']">{{
-              $t('page.business.zykgl.mjy.plgd') }}</el-button>
-        </el-col>
-        <el-col :span="1.5">
-          <!-- 批量锁定 -->
-          <el-button type="primary" :disabled="multiple" @click="handlePlsd"
-            v-hasPermi="['business:resource:mjy:ffjlsd']">{{
-              $t('page.business.zykgl.mjy.plsd') }}</el-button>
-        </el-col>
-        <el-col :span="1.5">
-          <!-- 导出 -->
-          <el-button type="primary" :disabled="multiple" @click="handleDc"
-            v-hasPermi="['business:resource:mjy:ffjldc']">{{
-              $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"
-          :show-overflow-tooltip="true" />
-        <el-table-column :label="$t('page.business.zykgl.mjy.bh')" align="center" prop="bh"
-          :show-overflow-tooltip="true" />
-        <el-table-column :label="$t('page.business.zykgl.mjy.md')" align="center" prop="mdMc"
-          :show-overflow-tooltip="true" />
-        <el-table-column :label="$t('page.business.zykgl.mjy.zytj')" align="center" prop="zytj"
-          :show-overflow-tooltip="true" />
-        <el-table-column :label="$t('page.business.zykgl.mjy.cksj')" align="center" prop="ffrq" width="150px" />
-        <el-table-column :label="$t('page.business.zykgl.mjy.rksj')" align="center" prop="ghrq" width="150px" />
-        <el-table-column :label="$t('page.business.zykgl.mjy.ckjz')" align="center" width="150px">
-          <template slot-scope="scope">
-            {{ scope.row.ckl }} {{ scope.row.ckldw }}
-          </template>
-        </el-table-column>
-        <el-table-column :label="$t('page.business.zykgl.mjy.rkjz')" align="center" width="150px">
-          <template slot-scope="scope">
-            {{ scope.row.rkl }} {{ scope.row.rkldw }}
-          </template>
-        </el-table-column>
-        <el-table-column :label="$t('page.business.zykgl.mjy.syl')" align="center" width="150px">
-          <template slot-scope="scope">
-            {{ scope.row.syl }} {{ scope.row.syldw }}
-          </template>
-        </el-table-column>
-        <el-table-column :label="$t('page.business.zykgl.mjy.lqr1')" align="center" prop="lqr1Mc"
-          :show-overflow-tooltip="true" />
-        <el-table-column :label="$t('page.business.zykgl.mjy.lqr2')" align="center" prop="lqr2Mc"
-          :show-overflow-tooltip="true" />
-        <el-table-column :label="$t('page.business.zykgl.mjy.kgy1')" align="center" prop="kgy1Mc"
-          :show-overflow-tooltip="true" />
-        <el-table-column :label="$t('page.business.zykgl.mjy.kgy2')" align="center" prop="kgy2Mc"
-          :show-overflow-tooltip="true" />
-        <el-table-column :label="$t('page.business.zykgl.mjy.zcg')" align="center" prop="zcgMc"
-          :show-overflow-tooltip="true" />
-        <el-table-column :label="$t('page.business.zykgl.mjy.jlzt')" align="center" width="100px" fixed="right">
-          <template slot-scope="scope">
-            <span v-if="scope.row.jlzt == 1">{{ $t('page.business.zykgl.jlzt.wsd') }}</span>
-            <span v-if="scope.row.jlzt == 3">{{ $t('page.business.zykgl.jlzt.ysd') }}</span>
-            <span v-if="scope.row.jlzt == 5">{{ $t('page.business.zykgl.jlzt.dgd') }}</span>
-            <span v-if="scope.row.jlzt == 7">{{ $t('page.business.zykgl.jlzt.gd') }}</span>
-            <span v-if="scope.row.jlzt == 9">{{ $t('page.business.zykgl.jlzt.djd') }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column :label="$t('page.business.zykgl.mjy.jyzt')" align="center" width="100px"  fixed="right">
-          <template slot-scope="scope">
-            <span v-if="scope.row.jyzt == 1">{{ $t('page.business.zykgl.jyzt.wjy') }}</span>
-            <span v-if="scope.row.jyzt == 3">{{ $t('page.business.zykgl.jyzt.djy') }}</span>
-            <span v-if="scope.row.jyzt == 5">{{ $t('page.business.zykgl.jyzt.jyz') }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column :label="$t('form.operate')" fixed="right" align="center" class-name="small-padding fixed-width"
-          width="250px">
-          <template slot-scope="scope">
-            <template v-if="scope.row.jlzt == 1||scope.row.jlzt == 3||scope.row.jlzt == 7">
+        <el-table v-loading="loading" :data="list" @selection-change="handleSelectionChange">
+          <el-table-column type="selection" fixed="left"   width="55" align="center" :selectable="checkSelectable" />
+          <el-table-column :label="$t('page.business.zykgl.mjy.mc')" align="left" prop="mc"
+            :show-overflow-tooltip="true" />
+          <el-table-column :label="$t('page.business.zykgl.mjy.bh')" align="center" prop="bh"
+            :show-overflow-tooltip="true" />
+          <el-table-column :label="$t('page.business.zykgl.mjy.md')" align="center" prop="mdMc"
+            :show-overflow-tooltip="true" />
+          <el-table-column :label="$t('page.business.zykgl.mjy.zytj')" align="center" prop="ffzytj"
+            :show-overflow-tooltip="true" />
+          <el-table-column :label="$t('page.business.zykgl.mjy.cksj')" align="center" prop="ffrq" width="150px" />
+          <el-table-column :label="$t('page.business.zykgl.mjy.rksj')" align="center" prop="ghrq" width="150px" />
+          <el-table-column :label="$t('page.business.zykgl.mjy.ckjz')" align="center" width="150px">
+            <template slot-scope="scope">
+              {{ scope.row.ckl }} {{ scope.row.ckldw }}
+            </template>
+          </el-table-column>
+          <el-table-column :label="$t('page.business.zykgl.mjy.rkjz')" align="center" width="150px">
+            <template slot-scope="scope">
+              {{ scope.row.rkl }} {{ scope.row.rkldw }}
+            </template>
+          </el-table-column>
+          <el-table-column :label="$t('page.business.zykgl.mjy.syl')" align="center" width="150px">
+            <template slot-scope="scope">
+              {{ scope.row.syl }} {{ scope.row.syldw }}
+            </template>
+          </el-table-column>
+          <el-table-column :label="$t('page.business.zykgl.mjy.lqr1')" align="center" prop="lqr1Mc"
+            :show-overflow-tooltip="true" />
+          <el-table-column :label="$t('page.business.zykgl.mjy.lqr2')" align="center" prop="lqr2Mc"
+            :show-overflow-tooltip="true" />
+          <el-table-column :label="$t('page.business.zykgl.mjy.kgy1')" align="center" prop="kgy1Mc"
+            :show-overflow-tooltip="true" />
+          <el-table-column :label="$t('page.business.zykgl.mjy.kgy2')" align="center" prop="kgy2Mc"
+            :show-overflow-tooltip="true" />
+          <el-table-column :label="$t('page.business.zykgl.mjy.zcg')" align="center" prop="zcgMc"
+            :show-overflow-tooltip="true" />
+          <el-table-column :label="$t('page.business.zykgl.mjy.jlzt')" align="center" width="100px" fixed="right">
+            <template slot-scope="scope">
+              <span v-if="scope.row.jlzt == 1">{{ $t('page.business.zykgl.jlzt.wsd') }}</span>
+              <span v-if="scope.row.jlzt == 3">{{ $t('page.business.zykgl.jlzt.ysd') }}</span>
+              <span v-if="scope.row.jlzt == 5">{{ $t('page.business.zykgl.jlzt.dgd') }}</span>
+              <span v-if="scope.row.jlzt == 7">{{ $t('page.business.zykgl.jlzt.gd') }}</span>
+              <span v-if="scope.row.jlzt == 9">{{ $t('page.business.zykgl.jlzt.djd') }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column :label="$t('page.business.zykgl.mjy.jyzt')" align="center" width="100px" fixed="right">
+            <template slot-scope="scope">
+              <span v-if="scope.row.jyzt == 1">{{ $t('page.business.zykgl.jyzt.wjy') }}</span>
+              <span v-if="scope.row.jyzt == 3">{{ $t('page.business.zykgl.jyzt.djy') }}</span>
+              <span v-if="scope.row.jyzt == 5">{{ $t('page.business.zykgl.jyzt.jyz') }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column :label="$t('form.operate')" fixed="right" align="center"
+            class-name="small-padding fixed-width" width="250px">
+            <template slot-scope="scope">
+               <!-- 加签 -->
+              <el-button v-if="scope.row.jlzt == 1 " type="text"
+                @click="handleJq(scope.row)" v-hasPermi="['business:resource:mjy:ffjljq']">{{
+                  $t('page.business.zykgl.mjy.jiaqian') }}</el-button>
               <!-- 详情 -->
-              <el-button type="text" @click="handleXq(scope.row)"
-                v-hasPermi="['business:resource:mjy:ffjlList']">{{
+              <el-button v-if="scope.row.jlzt == 1 || scope.row.jlzt == 3 || scope.row.jlzt == 7" type="text"
+                @click="handleXq(scope.row)" v-hasPermi="['business:resource:mjy:ffjlxq']">{{
                   $t('page.business.zykgl.mjy.detail') }}</el-button>
+              <!-- 锁定 -->
+              <el-button type="text" v-if="scope.row.jlzt == 1" @click="handleSd(scope.row)"
+                v-hasPermi="['business:resource:mjy:ffjlsd']">{{
+                  $t('page.business.zykgl.mjy.lock') }}</el-button>
+              <!-- 解锁 -->
+              <el-button type="text" v-if="scope.row.jlzt == 3" @click="handleJs(scope.row)"
+                v-hasPermi="['business:resource:mjy:ffjljs']">{{
+                  $t('page.business.zykgl.mjy.unlock') }}</el-button>
+              <!-- 归档 -->
+              <el-button type="text" v-if="scope.row.jlzt == 3" @click="handleGd(scope.row)"
+                v-hasPermi="['business:resource:mjy:ffjlgd']">{{
+                  $t('page.business.zykgl.mjy.guidang') }}</el-button>
+              <!-- 解档 -->
+              <el-button type="text" v-if="scope.row.jlzt == 7" @click="handleJd(scope.row)"
+                v-hasPermi="['business:resource:mjy:ffjljd']">{{
+                  $t('page.business.zykgl.mjy.jiedang') }}</el-button>
+              <!-- 借阅 -->
+              <el-button type="text" v-if="scope.row.jyzt == 1" @click="handleJy(scope.row)"
+                v-hasPermi="['business:resource:mjy:ffjljy']">{{
+                  $t('page.business.zykgl.mjy.jieyue') }}</el-button>
             </template>
-            <template v-if="scope.row.zjzt == 9"></template>
-            <template v-if="scope.row.zjzt == 9"></template>
-
-            <!-- 锁定 -->
-            <el-button type="text" v-if="scope.row.jlzt == 1" @click="handleSd(scope.row)"
-              v-hasPermi="['business:resource:mjy:ffjlsd']">{{
-                $t('page.business.zykgl.mjy.lock') }}</el-button>
-            <!-- 解锁 -->
-            <el-button type="text" v-if="scope.row.jlzt == 3" @click="handleJs(scope.row)"
-              v-hasPermi="['business:resource:mjy:ffjljs']">{{
-                $t('page.business.zykgl.mjy.unlock') }}</el-button>
-            <!-- 归档 -->
-            <el-button type="text" v-if="scope.row.jlzt == 3" @click="handleGd(scope.row)"
-              v-hasPermi="['business:resource:mjy:ffjlgd']">{{
-                $t('page.business.zykgl.mjy.guidang') }}</el-button>
-            <!-- 解档 -->
-            <el-button type="text" v-if="scope.row.jlzt == 7" @click="handleJd(scope.row)"
-              v-hasPermi="['business:resource:mjy:ffjljd']">{{
-                $t('page.business.zykgl.mjy.jiedang') }}</el-button>
-            <!-- 借阅 -->
-            <el-button type="text" v-if="scope.row.jyzt == 1" @click="handleJy(scope.row)"
-              v-hasPermi="['business:resource:mjy:ffjljy']">{{
-                $t('page.business.zykgl.mjy.jieyue') }}</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
-        @pagination="getList" />
+          </el-table-column>
+        </el-table>
+        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
+          :limit.sync="queryParams.pageSize" @pagination="getList" />
+      </div>
       <!-- 锁定 -->
-      <Sd ref="Sd" @callback="handleQuery" />
+      <Sd key="Sd" ref="Sd" @callback="handleQuery" />
       <!-- 解锁 -->
-      <Js ref="Js" @callback="handleQuery" />
+      <Js key="Js" ref="Js" @callback="handleQuery" />
       <!-- 归档 -->
-      <Gd ref="Gd" @callback="handleQuery" />
+      <Gd key="Gd" ref="Gd" @callback="handleQuery" />
       <!-- 解档 -->
-      <Jd ref="Jd" @callback="handleQuery" />
+      <Jd key="Jd" ref="Jd" @callback="handleQuery" />
+      <!-- 借阅 -->
+      <Jy key="Jy" ref="Jy" @callback="handleQuery" />
       <!-- 借阅 -->
-      <Jy ref="Jy" @callback="handleQuery" />
+      <Xq key="Xq" v-show="showDetail" ref="Xq" @callback="closeXq"/>
+      <!-- 加签 -->
+      <Jq key="Jq" ref="Jq" @callback="handleQuery" />
     </div>
   </div>
 </template>
@@ -195,15 +200,18 @@ import Jy from "./ffjl/Jy";
 import Js from "./ffjl/Js";
 import Gd from "./ffjl/Gd";
 import Jd from "./ffjl/Jd";
+import Xq from "./ffjl/Xq";
+import Jq from "./ffjl/Jq";
 
 export default {
   name: "FfjlList",
-  components: { Sd, Js, Gd, Jd, Jy },
+  components: { Sd, Js, Gd, Jd, Jy, Xq, Jq },
   data() {
     return {
       daterangeCk: [],
       daterangeRk: [],
       loading: true,
+      showDetail:false,
       single: true,
       multiple: true,
       total: 0,
@@ -234,6 +242,10 @@ export default {
     handleDc() {
 
     },
+    //加签
+    handleJq(row) {
+      this.$refs.Jq.show(row)
+    },
     //锁定
     handleSd(row) {
       this.$refs.Sd.show(row)
@@ -250,6 +262,15 @@ export default {
     handlePlsd() {
       this.$refs.Sd.showBatch(this.selectList)
     },
+      closeXq(){
+      this.showDetail=false
+      this.handleQuery()
+    },
+    //详情
+    handleXq(row) {
+      this.showDetail=true
+      this.$refs.Xq.show(row)
+    },
     //归档
     handleGd(row) {
       this.$refs.Gd.show(row)
diff --git a/src/views/business/resource/mjy/comps/mjy/Czrq.vue b/src/views/business/resource/mjy/comps/mjy/Czrq.vue
index 06ad661..c2ad4f1 100644
--- a/src/views/business/resource/mjy/comps/mjy/Czrq.vue
+++ b/src/views/business/resource/mjy/comps/mjy/Czrq.vue
@@ -229,7 +229,7 @@ export default {
         fhrId: null,
         jdrId: null,
         qmyy: '处置容器',
-        sdrmm: null
+        qmrmm: null
       }
       this.resetForm("form")
     },
diff --git a/src/views/business/resource/mjy/comps/mjy/Czyj.vue b/src/views/business/resource/mjy/comps/mjy/Czyj.vue
index 13d6a0e..3a5ee95 100644
--- a/src/views/business/resource/mjy/comps/mjy/Czyj.vue
+++ b/src/views/business/resource/mjy/comps/mjy/Czyj.vue
@@ -251,7 +251,7 @@ export default {
         jdrId: null,
         czl: null,
         qmyy: '处置药剂',
-        sdrmm: null
+        qmrmm: null
       }
       this.resetForm("form")
     },
diff --git a/src/views/business/resource/mjy/comps/mjy/Ff.vue b/src/views/business/resource/mjy/comps/mjy/Ff.vue
index a93c03c..0a90bd4 100644
--- a/src/views/business/resource/mjy/comps/mjy/Ff.vue
+++ b/src/views/business/resource/mjy/comps/mjy/Ff.vue
@@ -231,7 +231,7 @@ export default {
           message: ' ',
           trigger: 'blur'
         }],
-        sdrmm: [{
+        qmrmm: [{
           required: true,
           message: ' ',
           trigger: 'blur'
@@ -319,7 +319,7 @@ export default {
         ffr2mm: null,
         xmId: null,
         qmyy: '领取发放',
-        sdrmm: null,
+        qmrmm: null,
         remark: null
       }
       this.resetForm("form")
diff --git a/src/views/business/resource/mjy/comps/mjy/Gd.vue b/src/views/business/resource/mjy/comps/mjy/Gd.vue
index 36e8622..d753522 100644
--- a/src/views/business/resource/mjy/comps/mjy/Gd.vue
+++ b/src/views/business/resource/mjy/comps/mjy/Gd.vue
@@ -56,8 +56,8 @@ G<template>
         </el-row>
         <el-row>
           <el-col :span="24">
-            <el-form-item :label="$t('form.password')" prop="sdrmm">
-              <el-input type="password" v-model="form.sdrmm" maxlength="20" :placeholder="$t('form.placeholderInput')" />
+            <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>
@@ -86,7 +86,7 @@ export default {
       open: false,
       form: {},
       rules: {
-        sdrmm: [{
+        qmrmm: [{
           required: true,
           message: ' ',
           trigger: 'blur'
@@ -119,7 +119,7 @@ export default {
         mc: null,
         bh: null,
         qmyy: '申请归档',
-        sdrmm: null
+        qmrmm: null
       }
       this.resetForm("form")
     },
diff --git a/src/views/business/resource/mjy/comps/mjy/Gh.vue b/src/views/business/resource/mjy/comps/mjy/Gh.vue
index b236feb..3ada4f8 100644
--- a/src/views/business/resource/mjy/comps/mjy/Gh.vue
+++ b/src/views/business/resource/mjy/comps/mjy/Gh.vue
@@ -47,8 +47,8 @@ G<template>
         </el-row>
         <el-row>
           <el-col :span="24">
-            <el-form-item :label="$t('form.password')" prop="sdrmm">
-              <el-input type="password" v-model="form.sdrmm" maxlength="20" :placeholder="$t('form.placeholderInput')" />
+            <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>
@@ -76,7 +76,7 @@ export default {
       open: false,
       form: {},
       rules: {
-        sdrmm: [{
+        qmrmm: [{
           required: true,
           message: ' ',
           trigger: 'blur'
@@ -102,7 +102,7 @@ export default {
         mc: null,
         bh: null,
         qmyy: '归还',
-        sdrmm: null
+        qmrmm: null
       }
       this.resetForm("form")
     },
diff --git a/src/views/business/resource/mjy/comps/mjy/Jd.vue b/src/views/business/resource/mjy/comps/mjy/Jd.vue
index 665251c..45e79e5 100644
--- a/src/views/business/resource/mjy/comps/mjy/Jd.vue
+++ b/src/views/business/resource/mjy/comps/mjy/Jd.vue
@@ -57,8 +57,8 @@ G<template>
         </el-row>
         <el-row>
           <el-col :span="24">
-            <el-form-item :label="$t('form.password')" prop="sdrmm">
-              <el-input type="password" v-model="form.sdrmm" maxlength="20" :placeholder="$t('form.placeholderInput')" />
+            <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>
@@ -87,7 +87,7 @@ export default {
       open: false,
       form: {},
       rules: {
-        sdrmm: [{
+        qmrmm: [{
           required: true,
           message: ' ',
           trigger: 'blur'
@@ -120,7 +120,7 @@ export default {
         mc: null,
         bh: null,
         qmyy: '申请解档',
-        sdrmm: null
+        qmrmm: null
       }
       this.resetForm("form")
     },
diff --git a/src/views/business/resource/mjy/comps/mjy/Js.vue b/src/views/business/resource/mjy/comps/mjy/Js.vue
index 8f20c5b..583fddd 100644
--- a/src/views/business/resource/mjy/comps/mjy/Js.vue
+++ b/src/views/business/resource/mjy/comps/mjy/Js.vue
@@ -46,8 +46,8 @@ G<template>
         </el-row>
         <el-row>
           <el-col :span="24">
-            <el-form-item :label="$t('form.password')" prop="sdrmm">
-              <el-input type="password" v-model="form.sdrmm" maxlength="20" :placeholder="$t('form.placeholderInput')" />
+            <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>
@@ -71,7 +71,7 @@ export default {
       open: false,
       form: {},
       rules: {
-        sdrmm: [{
+        qmrmm: [{
           required: true,
           message: ' ',
           trigger: 'blur'
@@ -97,7 +97,7 @@ export default {
         mc: null,
         bh: null,
         qmyy: '解锁麻精药',
-        sdrmm: null
+        qmrmm: null
       }
       this.resetForm("form")
     },
diff --git a/src/views/business/resource/mjy/comps/mjy/Jy.vue b/src/views/business/resource/mjy/comps/mjy/Jy.vue
index 894fc29..ec8367b 100644
--- a/src/views/business/resource/mjy/comps/mjy/Jy.vue
+++ b/src/views/business/resource/mjy/comps/mjy/Jy.vue
@@ -57,8 +57,8 @@ G<template>
         </el-row>
         <el-row>
           <el-col :span="24">
-            <el-form-item :label="$t('form.password')" prop="sdrmm">
-              <el-input type="password" v-model="form.sdrmm" maxlength="20" :placeholder="$t('form.placeholderInput')" />
+            <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>
@@ -87,7 +87,7 @@ export default {
       open: false,
       form: {},
       rules: {
-        sdrmm: [{
+        qmrmm: [{
           required: true,
           message: ' ',
           trigger: 'blur'
@@ -120,7 +120,7 @@ export default {
         mc: null,
         bh: null,
         qmyy: '申请解档',
-        sdrmm: null
+        qmrmm: null
       }
       this.resetForm("form")
     },
diff --git a/src/views/business/resource/mjy/comps/mjy/Sd.vue b/src/views/business/resource/mjy/comps/mjy/Sd.vue
index e3c404c..4aa8ece 100644
--- a/src/views/business/resource/mjy/comps/mjy/Sd.vue
+++ b/src/views/business/resource/mjy/comps/mjy/Sd.vue
@@ -56,8 +56,8 @@ G<template>
         </el-row>
         <el-row>
           <el-col :span="24">
-            <el-form-item :label="$t('form.password')" prop="sdrmm">
-              <el-input type="password" v-model="form.sdrmm" maxlength="20" :placeholder="$t('form.placeholderInput')" />
+            <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>
@@ -86,7 +86,7 @@ export default {
       open: false,
       form: {},
       rules: {
-        sdrmm: [{
+        qmrmm: [{
           required: true,
           message: ' ',
           trigger: 'blur'
@@ -119,7 +119,7 @@ export default {
         mc: null,
         bh: null,
         qmyy: '锁定麻精药',
-        sdrmm: null
+        qmrmm: null
       }
       this.resetForm("form")
     },
diff --git a/src/views/business/resource/mjy/comps/mjy/SelectList.vue b/src/views/business/resource/mjy/comps/mjy/SelectList.vue
index 4c1996d..a5865d2 100644
--- a/src/views/business/resource/mjy/comps/mjy/SelectList.vue
+++ b/src/views/business/resource/mjy/comps/mjy/SelectList.vue
@@ -3,6 +3,23 @@ G<template>
     <el-table :data="selectList" border>
       <el-table-column :label="$t('page.business.zykgl.mjy.mc')" align="left" prop="mc" :show-overflow-tooltip="true" />
       <el-table-column :label="$t('page.business.zykgl.mjy.bh')" align="left" prop="bh" :show-overflow-tooltip="true" />
+       <el-table-column :label="$t('page.business.zykgl.mjy.zjzt')" align="center">
+            <template slot-scope="scope">
+              <span v-if="scope.row.zjzt == 1">{{ $t('page.business.zykgl.zjzt.rk') }}</span>
+              <span v-if="scope.row.zjzt == 3">{{ $t('page.business.zykgl.zjzt.yff') }}</span>
+              <span v-if="scope.row.zjzt == 5">{{ $t('page.business.zykgl.zjzt.ysd') }}</span>
+              <span v-if="scope.row.zjzt == 7">{{ $t('page.business.zykgl.zjzt.dgd') }}</span>
+              <span v-if="scope.row.zjzt == 9">{{ $t('page.business.zykgl.zjzt.gd') }}</span>
+              <span v-if="scope.row.zjzt == 11">{{ $t('page.business.zykgl.zjzt.djd') }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column :label="$t('page.business.zykgl.mjy.jyzt')" align="center" >
+            <template slot-scope="scope">
+              <span v-if="scope.row.jyzt == 1">{{ $t('page.business.zykgl.jyzt.wjy') }}</span>
+              <span v-if="scope.row.jyzt == 3">{{ $t('page.business.zykgl.jyzt.djy') }}</span>
+              <span v-if="scope.row.jyzt == 5">{{ $t('page.business.zykgl.jyzt.jyz') }}</span>
+            </template>
+          </el-table-column>
     </el-table>
   </div>
 </template>
diff --git a/src/views/business/resource/mjy/comps/mjy/Xq.vue b/src/views/business/resource/mjy/comps/mjy/Xq.vue
index 2e2a8cb..1a20e37 100644
--- a/src/views/business/resource/mjy/comps/mjy/Xq.vue
+++ b/src/views/business/resource/mjy/comps/mjy/Xq.vue
@@ -1,8 +1,17 @@
 G<template>
   <!-- 详情 -->
-  <el-dialog :title="$t('form.detail')" :visible.sync="open"  width="1200px" append-to-body :close-on-click-modal="false">
+  <div v-show="open">
     <div class="detail-container">
-      <div class="content">
+      <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="exportExcel()">{{ $t('form.export') }}</el-button>
+        </div>
+      </div>
+      <div class="detail-content">
         <div class="content-left">
           <div class="content-title">
             <div class="line"></div>
@@ -84,25 +93,32 @@ G<template>
           </div>
           <div class="pal">
             <el-table :data="tzList" v-loading="loadingTz">
-              <el-table-column :label="$t('page.business.zykgl.mjy.syr')" align="center" prop="qmrMc"  :show-overflow-tooltip="true"/>
-              <el-table-column :label="$t('page.business.zykgl.mjy.lqghr')" align="center" :show-overflow-tooltip="true">
+              <el-table-column :label="$t('page.business.zykgl.mjy.syr')" align="center" prop="qmrMc"
+                :show-overflow-tooltip="true" />
+              <el-table-column :label="$t('page.business.zykgl.mjy.lqghr')" align="center"
+                :show-overflow-tooltip="true">
                 <template slot-scope="scope">
                   {{ scope.row.lqrMc }}{{ scope.row.ghrMc }}
                 </template>
               </el-table-column>
-              <el-table-column :label="$t('page.business.zykgl.mjy.ffjsr')" align="center" :show-overflow-tooltip="true">
+              <el-table-column :label="$t('page.business.zykgl.mjy.ffjsr')" align="center"
+                :show-overflow-tooltip="true">
                 <template slot-scope="scope">
                   {{ scope.row.ffrMc }}{{ scope.row.jsrMc }}
                 </template>
               </el-table-column>
-              <el-table-column :label="$t('page.business.zykgl.mjy.czlx')" align="center" prop="qmyy" :show-overflow-tooltip="true"/>
-              <el-table-column :label="$t('page.business.zykgl.mjy.ffjsr')" align="center" :show-overflow-tooltip="true">
+              <el-table-column :label="$t('page.business.zykgl.mjy.czlx')" align="center" prop="qmyy"
+                :show-overflow-tooltip="true" />
+              <el-table-column :label="$t('page.business.zykgl.mjy.ffjsr')" 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.zykgl.mjy.bzyy')" align="center" prop="remark" :show-overflow-tooltip="true"/>
-              <el-table-column :label="$t('page.business.zykgl.mjy.ccsj')" align="center" prop="createTime"  width="150px"/>
+              <el-table-column :label="$t('page.business.zykgl.mjy.bzyy')" align="center" prop="remark"
+                :show-overflow-tooltip="true" />
+              <el-table-column :label="$t('page.business.zykgl.mjy.ccsj')" align="center" prop="createTime"
+                width="150px" />
             </el-table>
           </div>
           <div class="pal">
@@ -115,17 +131,23 @@ G<template>
             <div class="line"></div>
             <div class="subtitle"> 稽查轨迹日志</div>
           </div>
+          <jcgjList ref="jcgjList" @handleQuery="jcgjListHandleQuery" />
+
+          <pagination v-show="jcgjTotal > 0" small layout="prev, pager, next" :total="jcgjTotal"
+            @pagination="getJjcgjList" />
         </div>
       </div>
     </div>
-  </el-dialog>
+  </div>
 </template>
 
 <script>
-import { info, tzList } from "@/api/business/mjy/mjy"
+import { info, tzList, jcgjList } from "@/api/business/mjy/mjy"
+import JcgjList from "@/views/business/comps/common/JcgjList";
 
 export default {
   name: "Xq",
+  components: { JcgjList },
   data() {
     return {
       form: {},
@@ -137,12 +159,39 @@ export default {
         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.open = false
       this.$emit('callback')
@@ -153,12 +202,15 @@ export default {
         this.tzList = response.rows
         this.totalTz = response.total
         this.loadingTz = false
+        this.getJjcgjList()
       })
     },
     show(row) {
+      this.$modal.loading()
+      this.queryParamstZ.mjyId = row.id
+      this.queryJcgjParams.mjyId = row.id
       info({ id: row.id }).then(response => {
         this.form = response.data
-        this.queryParamstZ.mjyId = row.id
         this.getTzList()
         this.open = true
       })
diff --git a/src/views/business/resource/mjy/comps/mjy/Ysff.vue b/src/views/business/resource/mjy/comps/mjy/Ysff.vue
index 8bf5223..df61704 100644
--- a/src/views/business/resource/mjy/comps/mjy/Ysff.vue
+++ b/src/views/business/resource/mjy/comps/mjy/Ysff.vue
@@ -128,7 +128,7 @@ export default {
       open: false,
       form: {},
       rules: {
-        sdrmm: [{
+        qmrmm: [{
           required: true,
           message: ' ',
           trigger: 'blur'
@@ -189,7 +189,7 @@ export default {
         ids: null,
         qmyy: '钥匙发放',
         zcgId: null,
-        sdrmm: null,
+        qmrmm: null,
         remark: null,
         lqr1Id: null,
         lqr2Id: null,
diff --git a/src/views/business/resource/mjy/comps/mjyList.vue b/src/views/business/resource/mjy/comps/mjyList.vue
index 0b67c35..6ad87a8 100644
--- a/src/views/business/resource/mjy/comps/mjyList.vue
+++ b/src/views/business/resource/mjy/comps/mjyList.vue
@@ -2,9 +2,8 @@
   <div>
     <!-- 列表 -->
     <div>
-      <div class="app-container mjy">
-        <el-form :model="queryParams" ref="queryForm" class="search-area" :inline="true"
-          label-width="88px">
+      <div class="app-container mjy" v-show="!showDetail">
+        <el-form :model="queryParams" ref="queryForm" class="search-area" :inline="true" label-width="88px">
           <!-- 名称 -->
           <el-form-item :label="$t('page.business.zykgl.mjy.mc') + '：'">
             <el-input v-model="queryParams.mc" clearable @change="handleQuery"
@@ -19,21 +18,21 @@
           <el-form-item :label="$t('page.business.zykgl.mjy.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" />
-              <el-option key="3" :label="$t('page.business.zykgl.jyzt.djy')" value="3" />
-              <el-option key="5" :label="$t('page.business.zykgl.jyzt.jyz')" value="5" />
+              <el-option :label="$t('page.business.zykgl.jyzt.wjy')" :value="1" />
+              <el-option :label="$t('page.business.zykgl.jyzt.djy')" :value="3" />
+              <el-option :label="$t('page.business.zykgl.jyzt.jyz')" :value="5" />
             </el-select>
           </el-form-item>
           <!-- 制剂状态 -->
           <el-form-item :label="$t('page.business.zykgl.mjy.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" />
-              <el-option key="3" :label="$t('page.business.zykgl.zjzt.yff')" value="3" />
-              <el-option key="5" :label="$t('page.business.zykgl.zjzt.ysd')" value="5" />
-              <el-option key="7" :label="$t('page.business.zykgl.zjzt.dgd')" value="7" />
-              <el-option key="9" :label="$t('page.business.zykgl.zjzt.gd')" value="9" />
-              <el-option key="11" :label="$t('page.business.zykgl.zjzt.djd')" value="11" />
+              <el-option :label="$t('page.business.zykgl.zjzt.rk')" :value="1" />
+              <el-option :label="$t('page.business.zykgl.zjzt.yff')" :value="3" />
+              <el-option :label="$t('page.business.zykgl.zjzt.ysd')" :value="5" />
+              <el-option :label="$t('page.business.zykgl.zjzt.dgd')" :value="7" />
+              <el-option :label="$t('page.business.zykgl.zjzt.gd')" :value="9" />
+              <el-option :label="$t('page.business.zykgl.zjzt.djd')" :value="11" />
             </el-select>
           </el-form-item>
           <!-- 失效日期 -->
@@ -94,7 +93,7 @@
         </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 type="selection" fixed="left" width="55" align="center" :selectable="checkSelectable" />
           <el-table-column :label="$t('page.business.zykgl.mjy.mc')" align="left" prop="mc"
             :show-overflow-tooltip="true" />
           <el-table-column :label="$t('page.business.zykgl.mjy.bh')" align="center" prop="bh"
@@ -114,7 +113,7 @@
           <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" />
 
-          <el-table-column :label="$t('page.business.zykgl.mjy.zjzt')" align="center" width="150px">
+          <el-table-column :label="$t('page.business.zykgl.mjy.zjzt')" align="center" width="100px" fixed="right">
             <template slot-scope="scope">
               <span v-if="scope.row.zjzt == 1">{{ $t('page.business.zykgl.zjzt.rk') }}</span>
               <span v-if="scope.row.zjzt == 3">{{ $t('page.business.zykgl.zjzt.yff') }}</span>
@@ -124,7 +123,7 @@
               <span v-if="scope.row.zjzt == 11">{{ $t('page.business.zykgl.zjzt.djd') }}</span>
             </template>
           </el-table-column>
-          <el-table-column :label="$t('page.business.zykgl.mjy.jyzt')" align="center" width="150px">
+          <el-table-column :label="$t('page.business.zykgl.mjy.jyzt')" align="center" width="100px" fixed="right">
             <template slot-scope="scope">
               <span v-if="scope.row.jyzt == 1">{{ $t('page.business.zykgl.jyzt.wjy') }}</span>
               <span v-if="scope.row.jyzt == 3">{{ $t('page.business.zykgl.jyzt.djy') }}</span>
@@ -136,19 +135,16 @@
             <template slot-scope="scope">
               <template v-if="scope.row.zjzt == 1 || scope.row.zjzt == 3 || scope.row.zjzt == 5 || scope.row.zjzt == 9">
                 <!-- 详情 -->
-                <el-button type="text" @click="handleXq(scope.row)"
-                  v-hasPermi="['business:resource:mjy:list']">{{
-                    $t('page.business.zykgl.mjy.detail') }}</el-button>
+                <el-button type="text" @click="handleXq(scope.row)" v-hasPermi="['business:resource:mjy:xq']">{{
+                  $t('page.business.zykgl.mjy.detail') }}</el-button>
               </template>
               <template v-if="scope.row.zjzt == 1">
                 <!-- 发放 -->
-                <el-button type="text" @click="handleFf(scope.row)"
-                  v-hasPermi="['business:resource:mjy:ff']">{{
-                    $t('page.business.zykgl.mjy.fafang') }}</el-button>
+                <el-button type="text" @click="handleFf(scope.row)" v-hasPermi="['business:resource:mjy:ff']">{{
+                  $t('page.business.zykgl.mjy.fafang') }}</el-button>
                 <!-- 处置药剂 -->
-                <el-button type="text" @click="handleCzyj(scope.row)"
-                  v-hasPermi="['business:resource:mjy:czyj']">{{
-                    $t('page.business.zykgl.mjy.czyj') }}</el-button>
+                <el-button type="text" @click="handleCzyj(scope.row)" v-hasPermi="['business:resource:mjy:czyj']">{{
+                  $t('page.business.zykgl.mjy.czyj') }}</el-button>
                 <!-- 处置容器 -->
                 <el-button v-if="scope.row.rqzt == 1" type="text" @click="handleCzrq(scope.row)"
                   v-hasPermi="['business:resource:mjy:czrq']">{{
@@ -162,47 +158,39 @@
                   v-hasPermi="['business:resource:mjy:xgkc']">{{
                     $t('page.business.zykgl.mjy.xgkc') }}</el-button>
                 <!-- 锁定 -->
-                <el-button type="text" @click="handleSd(scope.row)"
-                  v-hasPermi="['business:resource:mjy:sd']">{{
-                    $t('page.business.zykgl.mjy.lock') }}</el-button>
+                <el-button type="text" @click="handleSd(scope.row)" v-hasPermi="['business:resource:mjy:sd']">{{
+                  $t('page.business.zykgl.mjy.lock') }}</el-button>
               </template>
               <template v-if="scope.row.bjzt == 3 && (scope.row.zjzt == 1 || scope.row.zjzt == 3)">
                 <!-- 审核编辑 -->
-                <el-button type="text" @click="handleShbj(scope.row)"
-                  v-hasPermi="['business:resource:mjy:shbj']">{{
-                    $t('page.business.zykgl.mjy.shbj') }}</el-button>
+                <el-button type="text" @click="handleShbj(scope.row)" v-hasPermi="['business:resource:mjy:shbj']">{{
+                  $t('page.business.zykgl.mjy.shbj') }}</el-button>
               </template>
               <template v-if="scope.row.kcbjzt == 3 && (scope.row.zjzt == 1 || scope.row.zjzt == 3)">
                 <!-- 审核修改库存 -->
-                <el-button type="text" @click="handleShxgkc(scope.row)"
-                  v-hasPermi="['business:resource:mjy:shxgkc']">{{
-                    $t('page.business.zykgl.mjy.shxgkc') }}</el-button>
+                <el-button type="text" @click="handleShxgkc(scope.row)" v-hasPermi="['business:resource:mjy:shxgkc']">{{
+                  $t('page.business.zykgl.mjy.shxgkc') }}</el-button>
               </template>
               <template v-if="scope.row.zjzt == 5">
                 <!-- 解锁 -->
-                <el-button type="text" @click="handleJs(scope.row)"
-                  v-hasPermi="['business:resource:mjy:js']">{{
-                    $t('page.business.zykgl.mjy.unlock') }}</el-button>
+                <el-button type="text" @click="handleJs(scope.row)" v-hasPermi="['business:resource:mjy:js']">{{
+                  $t('page.business.zykgl.mjy.unlock') }}</el-button>
                 <!-- 归档 -->
-                <el-button type="text" @click="handleGd(scope.row)"
-                  v-hasPermi="['business:resource:mjy:gd']">{{
-                    $t('page.business.zykgl.mjy.guidang') }}</el-button>
+                <el-button type="text" @click="handleGd(scope.row)" v-hasPermi="['business:resource:mjy:gd']">{{
+                  $t('page.business.zykgl.mjy.guidang') }}</el-button>
               </template>
               <template v-if="scope.row.zjzt == 3">
                 <!-- 归还 -->
-                <el-button type="text" @click="handleGh(scope.row)"
-                  v-hasPermi="['business:resource:mjy:gh']">{{
-                    $t('page.business.zykgl.mjy.guihuan') }}</el-button>
+                <el-button type="text" @click="handleGh(scope.row)" v-hasPermi="['business:resource:mjy:gh']">{{
+                  $t('page.business.zykgl.mjy.guihuan') }}</el-button>
               </template>
               <template v-if="scope.row.zjzt == 9">
                 <!-- 解档 -->
-                <el-button type="text" @click="handleJd(scope.row)"
-                  v-hasPermi="['business:resource:mjy:jd']">{{
-                    $t('page.business.zykgl.mjy.jiedang') }}</el-button>
+                <el-button type="text" @click="handleJd(scope.row)" v-hasPermi="['business:resource:mjy:jd']">{{
+                  $t('page.business.zykgl.mjy.jiedang') }}</el-button>
                 <!-- 借阅 -->
-                <el-button type="text" @click="handleJy(scope.row)"
-                  v-hasPermi="['business:resource:mjy:jy']">{{
-                    $t('page.business.zykgl.mjy.jieyue') }}</el-button>
+                <el-button type="text" @click="handleJy(scope.row)" v-hasPermi="['business:resource:mjy:jy']">{{
+                  $t('page.business.zykgl.mjy.jieyue') }}</el-button>
               </template>
             </template>
           </el-table-column>
@@ -212,35 +200,35 @@
           :limit.sync="queryParams.pageSize" @pagination="getList" />
       </div>
       <!-- 锁定 -->
-      <Sd ref="Sd" @callback="handleQuery" />
+      <Sd key="Sd" ref="Sd" @callback="handleQuery" />
       <!-- 解锁 -->
-      <Js ref="Js" @callback="handleQuery" />
+      <Js key="Js" ref="Js" @callback="handleQuery" />
       <!-- 归档 -->
-      <Gd ref="Gd" @callback="handleQuery" />
+      <Gd key="Gd" ref="Gd" @callback="handleQuery" />
       <!-- 解档 -->
-      <Jd ref="Jd" @callback="handleQuery" />
+      <Jd key="Jd" ref="Jd" @callback="handleQuery" />
       <!-- 编辑 -->
-      <Bj ref="Bj" @callback="handleQuery" />
+      <Bj key="Bj" ref="Bj" @callback="handleQuery" />
       <!-- 审核编辑 -->
-      <Shbj ref="Shbj" @callback="handleQuery" />
+      <Shbj key="Shbj" ref="Shbj" @callback="handleQuery" />
       <!-- 修改库存 -->
-      <Xgkc ref="Xgkc" @callback="handleQuery" />
+      <Xgkc key="Xgkc" ref="Xgkc" @callback="handleQuery" />
       <!-- 审核修改库存 -->
-      <Shxgkc ref="Shxgkc" @callback="handleQuery" />
+      <Shxgkc key="Shxgkc" ref="Shxgkc" @callback="handleQuery" />
       <!-- 借阅 -->
-      <Jy ref="Jy" @callback="handleQuery" />
+      <Jy key="Jy" ref="Jy" @callback="handleQuery" />
       <!-- 归还 -->
-      <Gh ref="Gh" @callback="handleQuery" />
+      <Gh key="Gh" ref="Gh" @callback="handleQuery" />
       <!-- 发放 -->
-      <Ff ref="Ff" @callback="handleQuery" />
+      <Ff key="Ff" ref="Ff" @callback="handleQuery" />
       <!-- 处置药剂 -->
-      <Czyj ref="Czyj" @callback="handleQuery" />
+      <Czyj key="Czyj" ref="Czyj" @callback="handleQuery" />
       <!-- 处置容器 -->
-      <Czrq ref="Czrq" @callback="handleQuery" />
+      <Czrq key="Czrq" ref="Czrq" @callback="handleQuery" />
       <!-- 钥匙发放 -->
-      <Ysff ref="Ysff" @callback="handleQuery" />
-       <!-- 详情 -->
-      <Xq ref="Xq" @callback="handleQuery" />
+      <Ysff key="Ysff" ref="Ysff" @callback="handleQuery" />
+      <!-- 详情 -->
+      <Xq v-show="showDetail" key="Xq" ref="Xq" @callback="closeXq" />
     </div>
   </div>
 </template>
@@ -272,6 +260,7 @@ export default {
       loading: true,
       single: true,
       multiple: true,
+      showDetail:false,
       total: 0,
       list: [],
       //勾选列表
@@ -353,8 +342,13 @@ export default {
     checkSelectable(row) {
       return true;
     },
+    closeXq(){
+      this.showDetail=false
+      this.handleQuery()
+    },
     //详情
     handleXq(row) {
+      this.showDetail=true
       this.$refs.Xq.show(row)
     },
     //批量解锁
diff --git a/src/views/business/resource/mjy/index.vue b/src/views/business/resource/mjy/index.vue
index ba52e08..d36dff5 100644
--- a/src/views/business/resource/mjy/index.vue
+++ b/src/views/business/resource/mjy/index.vue
@@ -2,10 +2,10 @@
   <div class="mjy">
     <el-tabs v-model="activeName" type="border-card" >
       <el-tab-pane label="麻精药管理" name="mjyList">
-        <mjyList />
+        <mjyList key="mjyList"/>
       </el-tab-pane>
       <el-tab-pane label="发放回收记录" name="ffjlList">
-        <ffjlList />
+        <ffjlList  key="ffjlList"/>
       </el-tab-pane>
     </el-tabs>
   </div>