fix：[资源库管理][麻精药管理，发放记录]优化

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>

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',

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
+  })
 }

src/lang/zh/business/resource/mjy/mjy.js

@@ -76,6 +76,7 @@ export default {
     ccsj:'操作时间',
     cksj:'出库时间',
     rksj:'入库时间',
+    jiaqian:'加签',
 
   
   

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>

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