diff --git a/src/api/business/mjy/mjyArchive.js b/src/api/business/mjy/mjyArchive.js
new file mode 100644
index 0000000..38bb5cf
--- /dev/null
+++ b/src/api/business/mjy/mjyArchive.js
@@ -0,0 +1,60 @@
+import request from '@/utils/request'
+
+// 列表
+export function list(query) {
+  return request({
+    url: '/system/business/mjyArchive/list',
+    method: 'get',
+    params: query
+  })
+}
+export function tygd(data) {
+  return request({
+    url: '/system/business/mjyArchive/tygd',
+    method: 'post',
+    data: data
+  })
+}
+
+export function jjgd(data) {
+  return request({
+    url: '/system/business/mjyArchive/jjgd',
+    method: 'post',
+    data: data
+  })
+}
+export function tyjd(data) {
+  return request({
+    url: '/system/business/mjyArchive/tyjd',
+    method: 'post',
+    data: data
+  })
+}
+export function jjjd(data) {
+  return request({
+    url: '/system/business/mjyArchive/jjjd',
+    method: 'post',
+    data: data
+  })
+}
+export function tyjy(data) {
+  return request({
+    url: '/system/business/mjyArchive/tyjy',
+    method: 'post',
+    data: data
+  })
+}
+export function jjjy(data) {
+  return request({
+    url: '/system/business/mjyArchive/jjjy',
+    method: 'post',
+    data: data
+  })
+}
+export function qrgh(data) {
+  return request({
+    url: '/system/business/mjyArchive/qrgh',
+    method: 'post',
+    data: data
+  })
+}
\ No newline at end of file
diff --git a/src/lang/en/business/resource/mjy.js b/src/lang/en/business/resource/mjy.js
index ba5899d..182e84a 100644
--- a/src/lang/en/business/resource/mjy.js
+++ b/src/lang/en/business/resource/mjy.js
@@ -126,5 +126,14 @@ export default {
   quchu: 'Take Out',
   cunchu: 'Storage',
   sfcc:'To Storage',
-  bdmc:'Preset Name'
+  bdmc:'Preset Name',
+  mjyda:'Drug Archive',
+  lqffda:'领取发放档案',
+  tygd:'同意归档',
+  jjgd:'拒绝归档',
+  tyjd:'同意解档',
+  jjjd:'拒绝解档',
+  tyjy:'同意借阅',
+  jjjy:'拒绝借阅',
+  qrgh:'确认归还',
 }
diff --git a/src/lang/zh/business/resource/mjy.js b/src/lang/zh/business/resource/mjy.js
index 8e0b300..1b71e24 100644
--- a/src/lang/zh/business/resource/mjy.js
+++ b/src/lang/zh/business/resource/mjy.js
@@ -127,5 +127,15 @@ export default {
   quchu: '取出',
   cunchu: '存储',
   sfcc:'是否存储',
-  bdmc:'表单名称'
+  bdmc:'表单名称',
+  mjyda:'麻精药档案',
+  lqffda:'领取发放档案',
+
+  tygd:'同意归档',
+  jjgd:'拒绝归档',
+  tyjd:'同意解档',
+  jjjd:'拒绝解档',
+  tyjy:'同意借阅',
+  jjjy:'拒绝借阅',
+  qrgh:'确认归还',
 }
diff --git a/src/views/business/archive/drug/comps/ffjlList.vue b/src/views/business/archive/drug/comps/ffjlList.vue
new file mode 100644
index 0000000..2033449
--- /dev/null
+++ b/src/views/business/archive/drug/comps/ffjlList.vue
@@ -0,0 +1,468 @@
+<template>
+  <div>
+    <div>
+      <!-- 列表 -->
+      <div class="ffjl" 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.resource.gyzj.mc') + '：'">
+                <el-input v-model="queryParams.mc" clearable 
+                  :placeholder="$t('form.placeholderInput')" />
+              </el-form-item>
+              <!-- 编号 -->
+              <el-form-item :label="$t('page.business.resource.gyzj.bh') + '：'">
+                <el-input v-model="queryParams.bh" clearable 
+                  :placeholder="$t('form.placeholderInput')" />
+              </el-form-item>
+              <!-- 目的 -->
+              <el-form-item :label="$t('page.business.resource.gyzj.md') + '：'">
+                <el-input v-model="queryParams.mdId" clearable 
+                  :placeholder="$t('form.placeholderInput')" />
+              </el-form-item>
+              <!-- 记录状态 -->
+              <el-form-item :label="$t('page.business.resource.gyzj.jlzt') + '：'">
+                <el-select v-model="queryParams.jlzt" :placeholder="$t('form.placeholderSelect')" clearable
+                  >
+                  <el-option :label="$t('page.business.resource.resource.jlzt.wsd')" :value="1" />
+                  <el-option :label="$t('page.business.resource.resource.jlzt.ysd')" :value="3" />
+                  <el-option :label="$t('page.business.resource.resource.jlzt.dgd')" :value="5" />
+                  <el-option :label="$t('page.business.resource.resource.jlzt.gd')" :value="7" />
+                  <el-option :label="$t('page.business.resource.resource.jlzt.djd')" :value="9" />
+                </el-select>
+              </el-form-item>
+              <!-- 借阅状态 -->
+              <el-form-item :label="$t('page.business.resource.gyzj.jyzt') + '：'" :label-width="$i18n.locale === 'zh_CN'?'88px':'150px'">
+                <el-select v-model="queryParams.jyzt" :placeholder="$t('form.placeholderSelect')" clearable>
+                  <el-option :label="$t('page.business.resource.resource.jyzt.wjy')" :value="1" />
+                  <el-option :label="$t('page.business.resource.resource.jyzt.djy')" :value="3" />
+                  <el-option :label="$t('page.business.resource.resource.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.resource.gyzj.cksj') + '：'" :label-width="$i18n.locale === 'zh_CN'?'88px':'180px'">
+                <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.resource.gyzj.rksj') + '：'" :label-width="$i18n.locale === 'zh_CN'?'88px':'180px'">
+                <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:gyzj:ffjlgd']">{{
+                $t('page.business.resource.gyzj.plgd') }}</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <!-- 批量锁定 -->
+            <el-button type="primary" :disabled="multiple" @click="handlePlsd"
+              v-hasPermi="['business:resource:gyzj:ffjlsd']">{{
+                $t('page.business.resource.gyzj.plsd') }}</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <!-- 导出 -->
+            <el-button type="primary"  @click="exportExcel"
+              v-hasPermi="['business:resource:gyzj: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" fixed="left" width="55" align="center" :selectable="checkSelectable" />
+          <el-table-column :label="$t('page.business.resource.gyzj.bh')" align="center" prop="bh"
+            :show-overflow-tooltip="true" />
+          <el-table-column :label="$t('page.business.resource.gyzj.mc')" align="left" prop="mc"
+            :show-overflow-tooltip="true" />
+         
+          <el-table-column :label="$t('page.business.resource.gyzj.md')" align="center" width="100px"  :show-overflow-tooltip="true" >
+            <template slot-scope="scope">
+              <span v-if="scope.row.mdOther && scope.row.mdOther != ''&&scope.row.mdMcs && scope.row.mdMcs != ''">{{ scope.row.mdMcs }},{{ scope.row.mdOther }}</span>
+              <span v-else>{{ scope.row.mdMcs }}{{ scope.row.mdOther }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column :label="$t('page.business.resource.gyzj.zytj')" align="center" prop="ffzytj" :width="$i18n.locale === 'zh_CN'?'100px':'180px'"/>
+          <el-table-column :label="$t('page.business.resource.gyzj.cksj')" align="center" prop="ffrq" width="150px" />
+          <el-table-column :label="$t('page.business.resource.gyzj.rksj')" align="center" prop="ghrq" width="150px" />
+          <el-table-column :label="$t('page.business.resource.gyzj.ckl')" align="center" :width="$i18n.locale === 'zh_CN'?'100px':'180px'">
+            <template slot-scope="scope">
+              {{ scope.row.ckl }} {{ scope.row.ckldw }}
+            </template>
+          </el-table-column>
+          <el-table-column :label="$t('page.business.resource.gyzj.rkl')" align="center" :width="$i18n.locale === 'zh_CN'?'100px':'180px'">
+            <template slot-scope="scope">
+              {{ scope.row.rkl }} {{ scope.row.rkldw }}
+            </template>
+          </el-table-column>
+          <el-table-column :label="$t('page.business.resource.gyzj.syl')" align="center" :width="$i18n.locale === 'zh_CN'?'80px':'120px'">
+            <template slot-scope="scope">
+              {{ scope.row.syl }} {{ scope.row.syldw }}
+            </template>
+          </el-table-column>
+           <el-table-column :label="$t('page.business.resource.gyzj.kgy1')" align="center" prop="jsr1Mc" :width="$i18n.locale === 'zh_CN'?'80px':'180px'"
+            :show-overflow-tooltip="true" />
+          <el-table-column :label="$t('page.business.resource.gyzj.kgy2')" align="center" prop="jsr2Mc" :width="$i18n.locale === 'zh_CN'?'80px':'180px'"
+            :show-overflow-tooltip="true" />
+          <el-table-column :label="$t('page.business.resource.gyzj.lqr1')" align="center" prop="lqr1Mc" :width="$i18n.locale === 'zh_CN'?'80px':'100px'"
+            :show-overflow-tooltip="true" />
+          <el-table-column :label="$t('page.business.resource.gyzj.lqr2')" align="center" prop="lqr2Mc" :width="$i18n.locale === 'zh_CN'?'80px':'100px'"
+            :show-overflow-tooltip="true" />
+         
+          <el-table-column :label="$t('page.business.resource.gyzj.zcg')" align="center" prop="zcgMc"
+            :show-overflow-tooltip="true" />
+          <el-table-column :label="$t('page.business.resource.gyzj.jlzt')" align="center" width="100px" fixed="right">
+            <template slot-scope="scope">
+              <span v-if="scope.row.jlzt == 1"><span class="status-circle wsd"></span>{{ $t('page.business.resource.resource.jlzt.wsd') }}</span>
+              <span v-if="scope.row.jlzt == 3"><span class="status-circle ysd"></span>{{ $t('page.business.resource.resource.jlzt.ysd') }}</span>
+              <span v-if="scope.row.jlzt == 5"><span class="status-circle dgd"></span>{{ $t('page.business.resource.resource.jlzt.dgd') }}</span>
+              <span v-if="scope.row.jlzt == 7"><span class="status-circle gd"></span>{{ $t('page.business.resource.resource.jlzt.gd') }}</span>
+              <span v-if="scope.row.jlzt == 9"><span class="status-circle djd"></span>{{ $t('page.business.resource.resource.jlzt.djd') }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column :label="$t('page.business.resource.gyzj.jyzt')" align="center" fixed="right" :width="$i18n.locale === 'zh_CN'?'100px':'180px'">
+            <template slot-scope="scope">
+              <span v-if="scope.row.jyzt == 1"><span class="status-circle wjy"></span>{{ $t('page.business.resource.resource.jyzt.wjy') }}</span>
+              <span v-if="scope.row.jyzt == 3"><span class="status-circle djy"></span>{{ $t('page.business.resource.resource.jyzt.djy') }}</span>
+              <span v-if="scope.row.jyzt == 5"><span class="status-circle jyz"></span>{{ $t('page.business.resource.resource.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:gyzj:ffjljq']">{{
+                  $t('page.business.resource.gyzj.jiaqian') }}</el-button>
+              <!-- 详情 -->
+              <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:gyzj:ffjlxq']">{{
+                  $t('page.business.resource.gyzj.detail') }}</el-button>
+              <!-- 锁定 -->
+              <el-button type="text" v-if="scope.row.jlzt == 1" @click="handleSd(scope.row)"
+                v-hasPermi="['business:resource:gyzj:ffjlsd']">{{
+                  $t('page.business.resource.gyzj.lock') }}</el-button>
+              <!-- 解锁 -->
+              <el-button type="text" v-if="scope.row.jlzt == 3" @click="handleJs(scope.row)"
+                v-hasPermi="['business:resource:gyzj:ffjljs']">{{
+                  $t('page.business.resource.gyzj.unlock') }}</el-button>
+              <!-- 归档 -->
+              <el-button type="text" v-if="scope.row.jlzt == 3" @click="handleGd(scope.row)"
+                v-hasPermi="['business:resource:gyzj:ffjlgd']">{{
+                  $t('page.business.resource.gyzj.guidang') }}</el-button>
+              <!-- 解档 -->
+              <el-button type="text" v-if="scope.row.jlzt == 7" @click="handleJd(scope.row)"
+                v-hasPermi="['business:resource:gyzj:ffjljd']">{{
+                  $t('page.business.resource.gyzj.jiedang') }}</el-button>
+              <!-- 借阅 -->
+              <el-button type="text" v-if="scope.row.jlzt == 7 && scope.row.jyzt == 1" @click="handleJy(scope.row)"
+                v-hasPermi="['business:resource:gyzj:ffjljy']">{{
+                  $t('page.business.resource.gyzj.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" />
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import { list } from "@/api/business/gyzj/gyzjFfjl"
+import moment from "moment";
+import { deepClone } from "@/utils/index";
+
+export default {
+  name: "FfjlList",
+  components: {  },
+  data() {
+    return {
+      daterangeCk: [],
+      daterangeRk: [],
+      loading: true,
+      showDetail: false,
+      single: true,
+      multiple: true,
+      total: 0,
+      list: [],
+      //勾选列表
+      selectList: [],
+      //查询条件
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        mc: null,
+        mdId: null,
+        jlzt: null,
+        jyzt: null,
+        bh: null,
+        startDateCk: null,
+        endDateCk: null,
+        startDateRk: null,
+        endDateRk: null,
+      },
+    }
+  },
+  created() {
+    this.getList()
+  },
+  methods: {
+    exportExcel() {
+      let that = this
+      that.$modal.loading()
+      let params = deepClone(this.queryParams)
+      params.pageSize = 999999
+      list(params).then(response => {
+        var tabelStr =
+          '<table border="1"  class="html-tabel">' +
+          '<tr style="background:#eee;">' +
+          '<th style="text-align: center;">' + this.$t('page.business.resource.gyzj.mc') + '</th>' +
+          '<th style="text-align: center;">' + this.$t('page.business.resource.gyzj.bh') + '</th>' +
+          '<th style="text-align: center;">' + this.$t('page.business.resource.gyzj.md') + '</th>' +
+          '<th style="text-align: center;">' + this.$t('page.business.resource.gyzj.zytj') + '</th>' +
+          '<th style="text-align: center;">' + this.$t('page.business.resource.gyzj.cksj') + '</th>' +
+          '<th style="text-align: center;">' + this.$t('page.business.resource.gyzj.rksj') + '</th>' +
+          '<th style="text-align: center;">' + this.$t('page.business.resource.gyzj.ckmz') + '</th>' +
+          '<th style="text-align: center;">' + this.$t('page.business.resource.gyzj.rkmz') + '</th>' +
+          '<th style="text-align: center;">' + this.$t('page.business.resource.gyzj.syl') + '</th>' +
+          '<th style="text-align: center;">' + this.$t('page.business.resource.gyzj.lqr1') + '</th>' +
+          '<th style="text-align: center;">' + this.$t('page.business.resource.gyzj.lqr2') + '</th>' +
+          '<th style="text-align: center;">' + this.$t('page.business.resource.gyzj.kgy1') + '</th>' +
+          '<th style="text-align: center;">' + this.$t('page.business.resource.gyzj.kgy2') + '</th>' +
+          '<th style="text-align: center;">' + this.$t('page.business.resource.gyzj.zcg') + '</th>' +
+          '<th style="text-align: center;">' + this.$t('page.business.resource.gyzj.jlzt') + '</th>' +
+          '<th style="text-align: center;">' + this.$t('page.business.resource.gyzj.jyzt') + '</th>' +
+          ' </tr>'
+        let _datastr = ''
+        _.forEach(response.rows, function (value) {
+          let jlzt = ''
+          switch (value.jlzt) {
+            case 1:
+              jlzt = that.$t('page.business.resource.resource.jlzt.wsd')
+              break
+            case 3:
+              jlzt = that.$t('page.business.resource.resource.jlzt.ysd')
+              break
+            case 5:
+              jlzt = that.$t('page.business.resource.resource.jlzt.dgd')
+              break
+            case 7:
+              jlzt = that.$t('page.business.resource.resource.jlzt.gd')
+              break
+            case 9:
+              jlzt = that.$t('page.business.resource.resource.jlzt.djd')
+              break
+            default: zjzt = ''
+          }
+          let jyzt = ''
+          switch (value.jyzt) {
+            case 1:
+              jyzt = that.$t('page.business.resource.resource.jyzt.wjy')
+              break
+            case 3:
+              jyzt = that.$t('page.business.resource.resource.jyzt.djy')
+              break
+            case 5:
+              jyzt = that.$t('page.business.resource.resource.jyzt.jyz')
+              break
+            default: jyzt = ''
+          }
+          _datastr =
+            _datastr +
+            '<tr style="text-align: center;">' +
+            ' <td>' +
+            value.mc +
+            '</td>' +
+            ' <td>' +
+            '&nbsp;'+value.bh +
+            '</td>' +
+            ' <td>' +
+            (value.mdMcs&&value.mdMcs!=''&&value.mdOther&&value.mdOther!=''? (value.mdMcs +","+value.mdOther) :(value.mdMcs +value.mdOther))+
+            '</td>' +
+            ' <td>' +
+            value.ffzytj +
+            '</td>' +
+            ' <td>' +
+            value.ffrq +
+            '</td>' +
+            ' <td>' +
+            value.ghrq +
+            '</td>' +
+            ' <td>' +
+            value.ckl +value.ckldw+
+            '</td>' +
+            ' <td>' +
+            value.rkl+value.rkldw +
+            '</td>' +
+            ' <td>' +
+            value.syl+value.syldw +
+            '</td>' +
+            ' <td>' +
+            value.lqr1Mc +
+            '</td>' +
+            ' <td>' +
+            value.lqr2Mc +
+            '</td>' +
+            ' <td>' +
+            value.jsr1Mc +
+            '</td>' +
+            ' <td>' +
+            value.jsr2Mc +
+            '</td>' +
+            ' <td>' +
+            value.zcgMc +
+            '</td>' +
+            ' <td>' +
+            jlzt +
+            '</td>' +
+            ' <td>' +
+            jyzt +
+            '</td>' +
+            '</tr>'
+        })
+        tabelStr = tabelStr + _datastr + ' <table>'
+        // Worksheet名
+        var worksheet = that.$t('page.business.resource.gyzj.ffhsjl')
+        var uri = 'data:application/vnd.ms-excel;base64,'
+        // 真正要导出（下载）的HTML模板
+        var exportTemplate = `<html xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:x="urn:schemas-microsoft-com:office:excel" 
+                    xmlns="http://www.w3.org/TR/REC-html40">
+                    <head><!--[if gte mso 9]><xml><x:ExcelWorkbook><x:ExcelWorksheets><x:ExcelWorksheet>
+                        <x:Name>${worksheet}</x:Name>
+                            <x:WorksheetOptions><x:DisplayGridlines/></x:WorksheetOptions></x:ExcelWorksheet>
+                        </x:ExcelWorksheets></x:ExcelWorkbook></xml><![endif]-->
+                    </head>
+                    <body>
+                        ${tabelStr}
+                    </body>
+                    </html>`
+        var a = document.createElement('a')
+        a.download = worksheet + '.xls'
+        a.href = uri + window.btoa(unescape(encodeURIComponent(exportTemplate)))
+        a.click()
+        that.$modal.closeLoading()
+      }).finally(() => {
+        that.$modal.closeLoading()
+      })
+    },
+    //加签
+    handleJq(row) {
+      this.$refs.Jq.show(row)
+    },
+    //锁定
+    handleSd(row) {
+      this.$refs.Sd.show(row)
+    },
+    //解锁
+    handleJs(row) {
+      this.$refs.Js.show(row)
+    },
+    //批量归档
+    handlePlgd() {
+      this.$refs.Gd.showBatch(this.selectList)
+    },
+    //批量锁定
+    handlePlsd() {
+      this.$refs.Sd.showBatch(this.selectList)
+    },
+    closeXq() {
+      this.showDetail = false
+      this.$emit('showDetail', this.showDetail)
+      this.handleQuery()
+    },
+    //详情
+    handleXq(row) {
+      this.showDetail = true
+      this.$emit('showDetail', this.showDetail)
+      this.$refs.Xq.show(row)
+    },
+    //归档
+    handleGd(row) {
+      this.$refs.Gd.show(row)
+    },
+    //借阅
+    handleJy(row) {
+      this.$refs.Jy.show(row)
+    },
+    //解档
+    handleJd(row) {
+      this.$refs.Jd.show(row)
+    },
+    //是否可勾选
+    checkSelectable(row) {
+      return true;
+    },
+    //获取列表
+    getList() {
+      if (this.daterangeCk != null && this.daterangeCk.length > 0) {
+        this.queryParams.startDateCk = this.daterangeCk[0]
+        this.queryParams.endDateCk = moment().add(this.daterangeCk[1], 'days').format('YYYY-MM-DD');
+      } else {
+        this.queryParams.startDateCk = ''
+        this.queryParams.endDateCk = ''
+      }
+      if (this.daterangeRk != null && this.daterangeRk.length > 0) {
+        this.queryParams.startDateRk = this.daterangeRk[0]
+        this.queryParams.endDateRk = moment().add(this.daterangeRk[1], 'days').format('YYYY-MM-DD');
+      } else {
+        this.queryParams.startDateRk = ''
+        this.queryParams.endDateRk = ''
+      }
+      this.loading = true
+      list(this.queryParams).then(response => {
+        this.list = response.rows
+        this.total = response.total
+        this.loading = false
+      })
+    },
+    //查询
+    handleQuery() {
+      this.queryParams.pageNum = 1
+      this.getList()
+    },
+    //重置
+    resetQuery() {
+      this.queryParams.mc = null
+      this.queryParams.mdId = null
+      this.queryParams.jlzt = null
+      this.queryParams.jyzt = null
+      this.queryParams.bh = null
+      this.queryParams.startDateCk = null
+      this.queryParams.endDateCk = null
+      this.queryParams.startDateRk = null
+      this.queryParams.endDateRk = null
+      this.daterangeCk = []
+      this.daterangeRk = []
+      this.handleQuery()
+    },
+    //勾选回调
+    handleSelectionChange(selection) {
+      this.single = selection.length !== 1
+      this.multiple = !selection.length
+      this.selectList = selection
+    }
+  }
+}
+</script>
+<style rel="stylesheet/scss" lang="scss">
+.ffjl {
+  background: #fff;
+  padding: 10px 10px;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/business/archive/drug/comps/mjyList.vue b/src/views/business/archive/drug/comps/mjyList.vue
new file mode 100644
index 0000000..5c117cc
--- /dev/null
+++ b/src/views/business/archive/drug/comps/mjyList.vue
@@ -0,0 +1,268 @@
+<template>
+  <div>
+    <!-- 列表 -->
+    <div>
+      <div class="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.resource.mjy.mc') + '：'">
+            <el-input v-model="queryParams.mc" clearable :placeholder="$t('form.placeholderInput')" />
+          </el-form-item>
+          <!-- 编号 -->
+          <el-form-item :label="$t('page.business.resource.mjy.bh') + '：'">
+            <el-input v-model="queryParams.bh" clearable :placeholder="$t('form.placeholderInput')" />
+          </el-form-item>
+          <!-- 借阅状态 -->
+          <el-form-item :label="$t('page.business.resource.mjy.jyzt') + '：'"
+            :label-width="$i18n.locale === 'zh_CN' ? '88px' : '150px'">
+            <el-select v-model="queryParams.jyzt" :placeholder="$t('form.placeholderSelect')" clearable>
+              <el-option :label="$t('page.business.resource.resource.jyzt.wjy')" :value="1" />
+              <el-option :label="$t('page.business.resource.resource.jyzt.djy')" :value="3" />
+              <el-option :label="$t('page.business.resource.resource.jyzt.jyz')" :value="5" />
+            </el-select>
+          </el-form-item>
+          <!-- 制剂状态 -->
+          <el-form-item :label="$t('page.business.resource.mjy.zjzt') + '：'">
+            <el-select v-model="queryParams.zjzt" :placeholder="$t('form.placeholderSelect')" clearable>
+              <el-option :label="$t('page.business.resource.resource.zjzt.rk')" :value="1" />
+              <el-option :label="$t('page.business.resource.resource.zjzt.wrk')" :value="2" />
+              <el-option :label="$t('page.business.resource.resource.zjzt.yff')" :value="3" />
+              <el-option :label="$t('page.business.resource.resource.zjzt.ysd')" :value="5" />
+              <el-option :label="$t('page.business.resource.resource.zjzt.dgd')" :value="7" />
+              <el-option :label="$t('page.business.resource.resource.zjzt.gd')" :value="9" />
+              <el-option :label="$t('page.business.resource.resource.zjzt.djd')" :value="11" />
+            </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-form>
+
+        <el-table v-loading="loading" :data="list">
+          <el-table-column :label="$t('page.business.resource.mjy.mc')" align="left" prop="mc"
+            :show-overflow-tooltip="true" />
+          <el-table-column :label="$t('page.business.resource.mjy.bh')" align="center" prop="bh"
+            :show-overflow-tooltip="true" />
+          <el-table-column :label="$t('page.business.resource.mjy.nd')" align="center">
+            <template slot-scope="scope">
+              {{ scope.row.nd }}{{ scope.row.nddw }}
+            </template>
+          </el-table-column>
+          <el-table-column :label="$t('page.business.resource.mjy.kcl')" align="center">
+            <template slot-scope="scope">
+              {{ scope.row.kc }}{{ scope.row.kcdw }}
+            </template>
+          </el-table-column>
+          <el-table-column :label="$t('page.business.resource.mjy.sxrq')" align="center" prop="sxrq" width="150px" />
+          <el-table-column :label="$t('page.business.resource.mjy.cctj')" align="center" prop="cctj" width="140px" />
+          <el-table-column :label="$t('page.business.resource.mjy.ccwz')" align="center" prop="ccwz" width="130px" />
+
+          <el-table-column :label="$t('page.business.resource.mjy.zjzt')" align="center" width="100px" fixed="right">
+            <template slot-scope="scope">
+              <span v-if="scope.row.zjzt == 1"><span class="status-circle rk"></span>{{
+                $t('page.business.resource.resource.zjzt.rk') }}</span>
+              <span v-if="scope.row.zjzt == 2"><span class="status-circle wrk"></span>{{
+                $t('page.business.resource.resource.zjzt.wrk') }}</span>
+              <span v-if="scope.row.zjzt == 3"><span class="status-circle yff"></span>{{
+                $t('page.business.resource.resource.zjzt.yff') }}</span>
+              <span v-if="scope.row.zjzt == 5"><span class="status-circle ysd"></span>{{
+                $t('page.business.resource.resource.zjzt.ysd') }}</span>
+              <span v-if="scope.row.zjzt == 7"><span class="status-circle dgd"></span>{{
+                $t('page.business.resource.resource.zjzt.dgd') }}</span>
+              <span v-if="scope.row.zjzt == 9"><span class="status-circle gd"></span>{{
+                $t('page.business.resource.resource.zjzt.gd') }}</span>
+              <span v-if="scope.row.zjzt == 11"><span class="status-circle djd"></span>{{
+                $t('page.business.resource.resource.zjzt.djd') }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column :label="$t('page.business.resource.mjy.jyzt')" align="center" fixed="right"
+            :width="$i18n.locale === 'zh_CN' ? '100px' : '150px'">
+            <template slot-scope="scope">
+              <span v-if="scope.row.jyzt == 1"><span class="status-circle wjy"></span>{{
+                $t('page.business.resource.resource.jyzt.wjy') }}</span>
+              <span v-if="scope.row.jyzt == 3"><span class="status-circle djy"></span>{{
+                $t('page.business.resource.resource.jyzt.djy') }}</span>
+              <span v-if="scope.row.jyzt == 5"><span class="status-circle jyz"></span>{{
+                $t('page.business.resource.resource.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>
+                <!-- 详情 -->
+                <el-button type="text" @click="handleXq(scope.row)" v-hasPermi="['business:archive:mjy:xq']">{{
+                  $t('page.business.resource.mjy.detail') }}</el-button>
+                <!-- 同意归档 -->
+                <el-button type="text" v-if="scope.row.zjzt==7" @click="handleSign(scope.row, 'page.business.resource.mjy.tygd', false, 'tygd')"
+                  v-hasPermi="['business:archive:mjy:tygd']">{{
+                    $t('page.business.resource.mjy.tygd') }}</el-button>
+                <!-- 拒绝归档 -->
+                <el-button type="text" v-if="scope.row.zjzt==7" @click="handleSign(scope.row, 'page.business.resource.mjy.jjgd', false, 'jjgd',true,true)"
+                  v-hasPermi="['business:archive:mjy:jjgd']">{{
+                    $t('page.business.resource.mjy.jjgd') }}</el-button>
+                <!-- 同意解档 -->
+                <el-button type="text" v-if="scope.row.zjzt==11" @click="handleSign(scope.row, 'page.business.resource.mjy.tyjd', false, 'tyjd')"
+                  v-hasPermi="['business:archive:mjy:tyjd']">{{
+                    $t('page.business.resource.mjy.tyjd') }}</el-button>
+                <!-- 拒绝解档 -->
+                <el-button type="text" v-if="scope.row.zjzt==11" @click="handleSign(scope.row, 'page.business.resource.mjy.jjjd', false, 'jjjd',true,true)"
+                  v-hasPermi="['business:archive:mjy:jjjd']">{{
+                    $t('page.business.resource.mjy.jjjd') }}</el-button>
+                <!-- 同意借阅 -->
+                <el-button type="text" v-if="scope.row.zjzt==9&&scope.row.jyzt==3" @click="handleSign(scope.row, 'page.business.resource.mjy.tyjy', true, 'tyjy')"
+                  v-hasPermi="['business:archive:mjy:tyjy']">{{
+                    $t('page.business.resource.mjy.tyjy') }}</el-button>
+                <!-- 拒绝借阅 -->
+                <el-button type="text" v-if="scope.row.zjzt==9&&scope.row.jyzt==3" @click="handleSign(scope.row, 'page.business.resource.mjy.jjjy', true, 'jjjy',true,true)"
+                  v-hasPermi="['business:archive:mjy:jjjy']">{{
+                    $t('page.business.resource.mjy.jjjy') }}</el-button>
+                <!-- 确认归还 -->
+                <el-button type="text" v-if="scope.row.zjzt==9&&scope.row.jyzt==5" @click="handleSign(scope.row, 'page.business.resource.mjy.qrgh', false, 'qrgh')"
+                  v-hasPermi="['business:archive:mjy:qrgh']">{{
+                    $t('page.business.resource.mjy.qrgh') }}</el-button>
+              </template>
+            </template>
+          </el-table-column>
+        </el-table>
+
+        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
+          :limit.sync="queryParams.pageSize" @pagination="getList" />
+      </div>
+      <!-- 详情 -->
+      <Xq v-show="showDetail" key="Xq" ref="Xq" @callback="closeXq" />
+      <!-- 签名 -->
+      <Sign ref="refSign" @callback="doSign" />
+    </div>
+  </div>
+</template>
+
+<script>
+import { list, tygd, jjgd, tyjd, jjjd, tyjy, jjjy, qrgh } from "@/api/business/mjy/mjyArchive"
+import Sign from "@/views/business/comps/common/sign";
+import Xq from "@/views/business/resource/mjy/comps/mjy/Xq";
+
+export default {
+  name: "GyzjDaList",
+  components: { Xq, Sign },
+  data() {
+    return {
+      loading: true,
+      showDetail: false,
+      type: '',
+      total: 0,
+      list: [],
+      form: {
+        id: null
+      },
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        mc: null,
+        jyzt: null,
+        zjzt: null,
+        bh: null,
+      },
+    }
+  },
+  created() {
+    this.getList()
+  },
+  methods: {
+    handleSign(row, qmyy, showDate, type,isReson,reasonRequired) {
+      this.form.id = row.id
+      let title = this.$t(qmyy)
+      this.type = type
+      this.$refs.refSign.show(title, title, showDate,(type=='jjjy'||type=='tyjy')?[row.jyksrq,row.jyjsrq]:[],isReson,reasonRequired)
+    },
+    doSign(val) {
+      let params = _.merge({}, this.form, val)
+      this.$modal.loading()
+      if (this.type == 'tygd') {
+        tygd(params).then(response => {
+          this.handleQuery()
+        }).finally(() => {
+          this.$modal.closeLoading()
+        })
+      } else if (this.type == 'jjgd') {
+        jjgd(params).then(response => {
+          this.handleQuery()
+        }).finally(() => {
+          this.$modal.closeLoading()
+        })
+      } else if (this.type == 'tyjd') {
+        tyjd(params).then(response => {
+          this.handleQuery()
+        }).finally(() => {
+          this.$modal.closeLoading()
+        })
+      } else if (this.type == 'jjjd') {
+        jjjd(params).then(response => {
+          this.handleQuery()
+        }).finally(() => {
+          this.$modal.closeLoading()
+        })
+      } else if (this.type == 'tyjy') {
+        tyjy(params).then(response => {
+          this.handleQuery()
+        }).finally(() => {
+          this.$modal.closeLoading()
+        })
+      } else if (this.type == 'jjjy') {
+        jjjy(params).then(response => {
+          this.handleQuery()
+        }).finally(() => {
+          this.$modal.closeLoading()
+        })
+      } else if (this.type == 'qrgh') {
+        qrgh(params).then(response => {
+          this.handleQuery()
+        }).finally(() => {
+          this.$modal.closeLoading()
+        })
+      }
+    },
+    closeXq() {
+      this.showDetail = false
+      this.handleQuery()
+      this.$emit('showDetail', this.showDetail)
+    },
+    //详情
+    handleXq(row) {
+      this.showDetail = true
+      this.$emit('showDetail', this.showDetail)
+      this.$refs.Xq.show(row)
+    },
+    //获取列表
+    getList() {
+      this.loading = true
+      list(this.queryParams).then(response => {
+        this.list = response.rows
+        this.total = response.total
+        this.loading = false
+      })
+    },
+    //查询
+    handleQuery() {
+      this.queryParams.pageNum = 1
+      this.getList()
+    },
+    //重置
+    resetQuery() {
+      this.queryParams.mc = null
+      this.queryParams.jyzt = null
+      this.queryParams.zjzt = null
+      this.queryParams.bh = null
+      this.handleQuery()
+    }
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss">
+.mjy {
+  background: #fff;
+  padding: 10px 10px;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/business/archive/drug/index.vue b/src/views/business/archive/drug/index.vue
new file mode 100644
index 0000000..15bb379
--- /dev/null
+++ b/src/views/business/archive/drug/index.vue
@@ -0,0 +1,94 @@
+<template>
+  <div class="mjy-index">
+    <div class="content-list">
+      <div class="search-box" v-show="!showDetail">
+        <div class="search-item" :class="active === item.key ? 'active' : ''" v-for="(item, index) in tabList"
+          :key="index" @click="changeTab(item)">
+          {{ $t(item.name) }}
+        </div>
+      </div>
+
+      <div class="content-box">
+        <mjyList v-if="active === 'mjyList'" @showDetail="showDetailCallback" />
+        <ffjlList v-if="active === 'ffjlList'" @showDetail="showDetailCallback" />
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import mjyList from "./comps/mjyList";
+import ffjlList from "./comps/ffjlList";
+export default {
+  name: 'Mjy',
+  components: { mjyList, ffjlList },
+  data() {
+    return {
+      showDetail: false,
+      tabList: [
+        { key: 'mjyList', name: 'page.business.resource.mjy.mjyda' },
+        { key: 'ffjlList', name: 'page.business.resource.mjy.lqffda' },
+      ],
+      active: 'mjyList',
+    }
+  },
+  created() { },
+  methods: {
+    show(row) {
+      this.study = row
+    },
+    changeTab(item) {
+      if (this.active !== item.key) {
+        this.active = item.key
+      }
+    },
+    showDetailCallback(val) {
+      this.showDetail = val
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.mjy-index {
+  padding: 10px 10px;
+
+  .search-box {
+    background: #fff;
+    padding: 0;
+    border-radius: 3px;
+    margin-bottom: 10px;
+
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+
+    .search-item {
+      padding: 10px 20px;
+      font-size: 14px;
+      cursor: pointer;
+
+      &.active {
+        background: #1890ff;
+        color: #fff;
+      }
+
+      &:hover {
+        background: #46a6ff;
+        color: #fff;
+      }
+
+      &:first-child {
+        border-top-left-radius: 3px;
+        border-bottom-left-radius: 3px;
+      }
+
+      &:last-child {
+        border-top-right-radius: 3px;
+        border-bottom-right-radius: 3px;
+      }
+    }
+  }
+
+  .content-box {}
+}
+</style>
diff --git a/src/views/business/archive/drugConfig/list.vue b/src/views/business/archive/drugConfig/list.vue
index d8c9302..58806e0 100644
--- a/src/views/business/archive/drugConfig/list.vue
+++ b/src/views/business/archive/drugConfig/list.vue
@@ -2,18 +2,12 @@
   <div class="app-container study-page">
     <div class="content-list" v-show="showType==='list'">
       <el-form :model="searchForm" ref="searchForm" :inline="true" class="search-box">
-        <el-form-item :label="$t('page.business.study.drug.name')" prop="name">
-          <el-input v-model="searchForm.name" :placeholder="$t('form.placeholderInput')" clearable style="width: 150px" @keyup.enter.native="search" />
-        </el-form-item>
         <el-form-item :label="$t('page.business.study.drug.sn')" prop="sn">
           <el-input v-model="searchForm.sn" :placeholder="$t('form.placeholderInput')" clearable style="width: 150px" @keyup.enter.native="search" />
         </el-form-item>
-
-        <el-form-item :label="$t('page.business.study.drug.dateRange')">
-          <el-date-picker v-model="daterange" clearable type="daterange" range-separator="-" :start-placeholder="$t('page.business.study.drug.startDate')"
-            :end-placeholder="$t('page.business.study.drug.endDate')" value-format="yyyy-MM-dd" @change="search" style="width: 220px" />
+        <el-form-item :label="$t('page.business.study.drug.name')" prop="name">
+          <el-input v-model="searchForm.name" :placeholder="$t('form.placeholderInput')" clearable style="width: 150px" @keyup.enter.native="search" />
         </el-form-item>
-
         <el-form-item prop="status" :label="$t('page.business.study.drug.status')">
           <el-select
             v-model="searchForm.status"
@@ -22,18 +16,12 @@
             style="width: 100px"
             @change="search"
           >
-            <el-option :label="$t('page.business.study.drug.statusCg')" :value="1" />
-            <el-option :label="$t('page.business.study.drug.statusSyz')" :value="3" />
-            <el-option :label="$t('page.business.study.drug.statusYsd')" :value="5" />
             <el-option :label="$t('page.business.study.drug.statusDgd')" :value="7" />
             <el-option :label="$t('page.business.study.drug.statusGd')" :value="9" />
             <el-option :label="$t('page.business.study.drug.statusDjd')" :value="10" />
           </el-select>
         </el-form-item>
 
-        <el-form-item prop="leaderName" :label="$t('page.business.study.drug.leader')">
-          <el-input v-model="searchForm.leaderName" :placeholder="$t('form.placeholderInput')" clearable style="width: 150px" @keyup.enter.native="search" />
-        </el-form-item>
         <div class="right-btn">
           <el-form-item>
             <el-button type="primary" icon="el-icon-search" @click="search">{{ $t('form.search') }}</el-button>
@@ -43,16 +31,10 @@
       </el-form>
 
       <div class="content-box">
-        <el-row class="add-box">
-          <el-col>
-            <el-button type="primary" icon="el-icon-plus" @click="edit(null)" v-hasPermi="['business:form:drug:add']">{{ $t('page.business.study.drug.add') }}</el-button>
-          </el-col>
-        </el-row>
-
         <el-table v-loading="loading" :data="list">
-          <el-table-column :label="$t('page.business.study.drug.sort')" type="index" width="50" />
-          <el-table-column :label="$t('page.business.study.drug.name')" prop="name" />
           <el-table-column :label="$t('page.business.study.drug.sn')" prop="sn" />
+          <el-table-column :label="$t('page.business.study.drug.name')" prop="name" />
+          <el-table-column :label="$t('page.business.study.drug.leader')" align="center" prop="leaderName" width="100" />
           <el-table-column :label="$t('page.business.study.drug.status')" prop="status" width="100">
             <template slot-scope="scope">
               <span v-if="scope.row.status===1"><span class="status-circle cg"></span>{{$t('page.business.study.drug.statusCg')}}</span>
@@ -67,36 +49,31 @@
           <el-table-column :label="$t('page.business.study.drug.borrowStatus')" prop="borrowStatus" width="100">
             <template slot-scope="scope">
               <span v-if="scope.row.borrowStatus===1">{{$t('page.business.study.drug.borrowStatusWjy')}}</span>
-              <span v-if="scope.row.borrowStatus===5">{{$t('page.business.study.drug.borrowStatusJyz')}}</span>
-              <span v-if="scope.row.borrowStatus===10">{{$t('page.business.study.drug.borrowStatusDjy')}}</span>
+              <span v-if="scope.row.borrowStatus===5">{{$t('page.business.study.drug.borrowStatusDjy')}}</span>
+              <span v-if="scope.row.borrowStatus===10">{{$t('page.business.study.drug.borrowStatusJyz')}}</span>
             </template>
           </el-table-column>
 
-          <el-table-column :label="$t('page.business.study.drug.formCount')" align="center" prop="formCount" width="100" />
-          <el-table-column :label="$t('page.business.study.drug.formFinishCount')" align="center" prop="formFinishCount" width="120" />
-          <!-- <el-table-column :label="$t('page.business.study.drug.leader')" align="center" :prop="$i18n.locale === 'zh_CN'?'leaderName':'leaderNameEn'" width="100" /> -->
-          <el-table-column :label="$t('page.business.study.drug.leader')" align="center" prop="leaderName" width="100" />
-          <el-table-column :label="$t('page.business.study.drug.dept')" align="center" prop="deptName" width="120" />
-          <el-table-column :label="$t('page.business.study.drug.createDate')" align="center" prop="createTime" width="140" />
-          
+          <el-table-column :label="$t('page.business.study.drug.sqgdsj')" align="center" prop="gdApplyTime" width="140" />
+
           <el-table-column :label="$t('form.operate')" fixed="right" align="center" width="200">
             <template slot-scope="scope">
-              <!-- 编辑 -->
-              <el-button type="text" @click="edit(scope.row)" v-hasPermi="['business:form:drug:edit']" v-if="(scope.row.leader==userId || checkRole(['bz'])) && (scope.row.status===1 || scope.row.status===3)">{{$t('page.business.study.drug.edit')}}</el-button>
-              <!-- 删除 -->
-              <el-button type="text" style="color:#E22626" @click="del(scope.row)" v-hasPermi="['business:form:drug:remove']" v-if="(scope.row.leader==userId || checkRole(['bz'])) && scope.row.status===1">{{$t('page.business.study.drug.delete')}}</el-button>
+              <!-- 同意归档 -->
+              <el-button type="text" @click="gd(scope.row,9)" v-hasPermi="['business:archive:trial:tygd']" v-if="scope.row.status===7">{{$t('page.business.study.drug.tygd')}}</el-button>
+              <!-- 拒绝归档 -->
+              <el-button type="text" @click="gd(scope.row,5)" v-hasPermi="['business:archive:trial:jjgd']" v-if="scope.row.status===7">{{$t('page.business.study.drug.jjgd')}}</el-button>
+              <!-- 同意解档 -->
+              <el-button type="text" @click="jd(scope.row,5)" v-hasPermi="['business:archive:trial:tyjd']" v-if="scope.row.status===10">{{$t('page.business.study.drug.tyjd')}}</el-button>
+              <!-- 拒绝解档 -->
+              <el-button type="text" @click="jd(scope.row,9)" v-hasPermi="['business:archive:trial:jjjd']" v-if="scope.row.status===10">{{$t('page.business.study.drug.jjjd')}}</el-button>
+              <!-- 同意借阅 -->
+              <el-button type="text" @click="jy(scope.row,10)" v-hasPermi="['business:archive:trial:tyjy']" v-if="scope.row.status===9 && scope.row.borrowStatus===5">{{$t('page.business.study.drug.tyjy')}}</el-button>
+              <!-- 拒绝借阅 -->
+              <el-button type="text" @click="jy(scope.row,1)" v-hasPermi="['business:archive:trial:jjjy']" v-if="scope.row.status===9 && scope.row.borrowStatus===5">{{$t('page.business.study.drug.jjjy')}}</el-button>
+              <!-- 确认归还 -->
+              <el-button type="text" @click="gh(scope.row)" v-hasPermi="['business:archive:trial:qrgh']" v-if="scope.row.status===9 && scope.row.borrowStatus===10">{{$t('page.business.study.drug.qrgh')}}</el-button>
               <!-- 详情 -->
-              <el-button type="text" @click="detail(scope.row)" v-hasPermi="['business:form:drug:detail']" v-if="scope.row.status===1 || scope.row.status===3 || scope.row.status===5 || (scope.row.status===9 && scope.row.borrowStatus===10)">{{$t('page.business.study.drug.detail')}}</el-button>
-              <!-- 进入试验 -->
-              <el-button type="text" @click="enter(scope.row)" v-hasPermi="['business:form:drug:enter']" v-if="scope.row.status===3 || scope.row.status===5 || (scope.row.status===9 && scope.row.borrowStatus===10)">{{$t('page.business.study.drug.enter')}}</el-button>
-              <!-- 归档 -->
-              <el-button type="text" @click="gd(scope.row)" v-hasPermi="['business:form:drug:gd']" v-if="(scope.row.leader==userId || checkRole(['bz'])) && scope.row.status===5">{{$t('page.business.study.drug.gd')}}</el-button>
-              <!-- 解锁 -->
-              <el-button type="text" @click="js(scope.row)" v-hasPermi="['business:form:drug:js']" v-if="(scope.row.leader==userId || checkRole(['bz'])) && scope.row.status===5">{{$t('page.business.study.drug.js')}}</el-button>
-              <!-- 解档 -->
-              <el-button type="text" @click="jd(scope.row)" v-hasPermi="['business:form:drug:jd']" v-if="(scope.row.leader==userId || checkRole(['bz'])) && scope.row.status===9 && scope.row.borrowStatus===1">{{$t('page.business.study.drug.jd')}}</el-button>
-              <!-- 借阅 -->
-              <el-button type="text" @click="jy(scope.row)" v-hasPermi="['business:form:drug:jy']" v-if="(scope.row.leader==userId || checkRole(['bz'])) && scope.row.status===9 && scope.row.borrowStatus===1">{{$t('page.business.study.drug.jy')}}</el-button>
+              <el-button type="text" @click="detail(scope.row)" v-hasPermi="['business:archive:trial:xq']" >{{$t('page.business.study.drug.detail')}}</el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -109,59 +86,22 @@
           @pagination="getList"
         />
       </div>
-      <!-- <el-dialog :close-on-click-modal="false" :title="infoDialog.title" :visible.sync="infoDialog.visible" width="600px" append-to-body>
-        <el-form ref="infoDialogForm" :model="infoDialog.formData" :rules="infoDialog.rules" label-width="100px">
-          <el-row>
-            <el-col :span="24">
-              <el-form-item :label="$t('page.business.study.drug.name')+'：'" prop="name">
-                <el-input v-model="infoDialog.formData.name" :placeholder="$t('form.placeholderInput')" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="24">
-              <el-form-item :label="$t('page.business.study.drug.sn')+'：'" prop="sn">
-                <el-input v-model="infoDialog.formData.sn" :placeholder="$t('form.placeholderInput')" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="24">
-              <el-form-item :label="$t('page.business.study.drug.leader')+'：'" prop="leader">
-                <el-input v-model="infoDialog.formData.leader" :placeholder="$t('form.placeholderInput')" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="24">
-              <el-form-item :label="$t('page.business.study.drug.remark')+'：'" prop="remark">
-                <el-input type="textarea" :rows="5" :placeholder="$t('form.placeholderInput')" v-model="infoDialog.formData.remark"> </el-input>
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-form>
-        <div slot="footer" class="dialog-footer">
-          <el-button type="primary" @click="save">确 定</el-button>
-          <el-button @click="infoDialog.visible = false">取 消</el-button>
-        </div>
-      </el-dialog> -->
     </div>
 
-    <Edit ref="edit" v-show="showType==='edit'" @cancel="showType='list'" @save="save" />
-    <!-- <Enter ref="enter" v-show="showType==='enter'" @cancel="showType='list'" /> -->
     <Detail ref="detail" v-show="showType==='detail'" @cancel="showType='list'" />
     <Sign ref="signRef" @callback="doSign" />
   </div>
 </template>
 
 <script>
-import { checkPermi, checkRole } from "@/utils/permission";
-import { drug_list,drug_delete,drug_gd,drug_js,drug_jd,drug_jy} from "@/api/business/form/drug";
-import Edit from '@/views/business/form/drug/comp/edit.vue'
-import Enter from '@/views/business/form/drug/comp/enter.vue'
+import { drug_archiveList,drug_doGd,drug_doJd,drug_doJy,drug_gh} from "@/api/business/form/drug";
 import Detail from '@/views/business/form/drug/comp/detail.vue'
-import Sign from '@/views/business/form/drug/comp/sign.vue'
+import Sign from '@/views/business/study/comp/sign.vue'
 export default {
   name: "ArchiveDrugConfig",
   props:{
   },
   components:{
-    Edit,
-    Enter,
     Detail,
     Sign
   },
@@ -172,16 +112,12 @@ export default {
   data() {
     return {
       userId:this.$store.getters.id,
-      daterange:[],
       searchForm: {
         pageNum: 1,
         pageSize: 10,
         sn:'',
         name:'',
-        leaderName:'',
         status:'',
-        startDate:'',
-        endDate:'',
       },
 
       loading: true,
@@ -198,13 +134,9 @@ export default {
     this.getList();
   },
   methods: {
-    checkPermi,
-    checkRole,
     getList() {
       this.loading = true;
-      this.searchForm.startDate = this.daterange && this.daterange.length > 0 ? this.daterange[0] : ''
-      this.searchForm.endDate = this.daterange && this.daterange.length > 1 ? this.daterange[1] : ''
-      drug_list(this.searchForm).then(response => {
+      drug_archiveList(this.searchForm).then(response => {
         this.list = response.rows;
         this.total = response.total;
       }).finally(()=>{
@@ -221,64 +153,34 @@ export default {
         pageSize: 10,
         sn:'',
         name:'',
-        leaderName:'',
         status:'',
-        startDate:'',
-        endDate:'',
       }
-      this.daterange = []
       this.search()
     },
-    edit(row) {
-      this.showType = 'edit'
-      this.$refs.edit.edit(row)
-    },
-    save() {
-      this.showType = 'list'
-      this.getList()
-    },
-    enter(row){
-      this.$tab.openPage(" ", '/drug/enter/' + row.id+'/ytbd')
-      // this.showType = 'enter'
-      // this.$refs.enter.show(row)
-    },
     detail(row){
       this.showType = 'detail'
       this.$refs.detail.show(row)
     },
-
-    del(row) {
-      this.operate = 'del'
-      this.operateRow = row
-      this.$refs.signRef.show(this.$t('page.business.study.drug.scsy'),this.$t('page.business.study.drug.scsy'))
-    },
-    doDel(signInfo) {
-      this.$modal.loading()
-      let postData = {
-        study:this.operateRow,
-        sign:signInfo
-      }
-      drug_delete(postData).then(() => {
-        this.$refs.signRef.cancel()
-        this.getList()
-      })
-      .finally(() => {
-        this.$modal.closeLoading()
-      })
-    },
-
-    gd(row) {
+    gd(row,status) {
       this.operate = 'gd'
-      this.operateRow = row
-      this.$refs.signRef.show(this.$t('page.business.study.drug.sqgd'),this.$t('page.business.study.drug.sqgd'))
+      this.operateRow = _.clone(row)
+      this.operateRow.status = status
+      this.$refs.signRef.show(
+        status==9?this.$t('page.business.study.drug.tygd'):this.$t('page.business.study.drug.jjgd'),
+        status==9?this.$t('page.business.study.drug.tygd'):this.$t('page.business.study.drug.jjgd'),
+        false,
+        null,
+        true,
+        status!=9
+      )
     },
     doGd(signInfo) {
       this.$modal.loading()
       let postData = {
-        study:this.operateRow,
+        study: this.operateRow,
         sign:signInfo
       }
-      drug_gd(postData).then(() => {
+      drug_doGd(postData).then(() => {
         this.$refs.signRef.cancel()
         this.getList()
       })
@@ -286,19 +188,26 @@ export default {
         this.$modal.closeLoading()
       })
     },
-
-    js(row) {
-      this.operate = 'js'
-      this.operateRow = row
-      this.$refs.signRef.show(this.$t('page.business.study.drug.jssy'),this.$t('page.business.study.drug.jssy'))
+    jd(row,status) {
+      this.operate = 'jd'
+      this.operateRow = _.clone(row)
+      this.operateRow.status = status
+      this.$refs.signRef.show(
+        status==5?this.$t('page.business.study.drug.tyjd'):this.$t('page.business.study.drug.jjjd'),
+        status==5?this.$t('page.business.study.drug.tyjd'):this.$t('page.business.study.drug.jjjd'),
+        false,
+        null,
+        true,
+        status!=5
+      )
     },
-    doJs(signInfo) {
+    doJd(signInfo) {
       this.$modal.loading()
       let postData = {
         study:this.operateRow,
         sign:signInfo
       }
-      drug_js(postData).then(() => {
+      drug_doJd(postData).then(() => {
         this.$refs.signRef.cancel()
         this.getList()
       })
@@ -307,18 +216,26 @@ export default {
       })
     },
 
-    jd(row) {
-      this.operate = 'jd'
-      this.operateRow = row
-      this.$refs.signRef.show(this.$t('page.business.study.drug.sqjd'),this.$t('page.business.study.drug.sqjd'))
+    jy(row,status) {
+      this.operate = 'jy'
+      this.operateRow = _.clone(row)
+      this.operateRow.borrowStatus = status
+      this.$refs.signRef.show(
+        status==10?this.$t('page.business.study.drug.tyjy'):this.$t('page.business.study.drug.jjjy'),
+        status==10?this.$t('page.business.study.drug.tyjy'):this.$t('page.business.study.drug.jjjy'),
+        true,
+        [row.borrowStartDate,row.borrowEndDate],
+        true,
+        status!=10
+      )
     },
-    doJd(signInfo) {
+    doJy(signInfo) {
       this.$modal.loading()
       let postData = {
         study:this.operateRow,
         sign:signInfo
       }
-      drug_jd(postData).then(() => {
+      drug_doJy(postData).then(() => {
         this.$refs.signRef.cancel()
         this.getList()
       })
@@ -327,18 +244,25 @@ export default {
       })
     },
 
-    jy(row) {
-      this.operate = 'jy'
+    gh(row) {
+      this.operate = 'gh'
       this.operateRow = row
-      this.$refs.signRef.show(this.$t('page.business.study.drug.sqjy'),this.$t('page.business.study.drug.sqjy'),true)
+      this.$refs.signRef.show(
+        this.$t('page.business.study.drug.qrgh'),
+        this.$t('page.business.study.drug.qrgh'),
+        false,
+        null,
+        false,
+        false
+      )
     },
-    doJy(signInfo) {
+    doGh(signInfo) {
       this.$modal.loading()
       let postData = {
         study:this.operateRow,
         sign:signInfo
       }
-      drug_jy(postData).then(() => {
+      drug_gh(postData).then(() => {
         this.$refs.signRef.cancel()
         this.getList()
       })
@@ -347,23 +271,19 @@ export default {
       })
     },
 
-
     doSign(val){
-      if(this.operate==='del'){
-        this.doDel(val)
-      }
       if(this.operate==='gd'){
         this.doGd(val)
       }
-      if(this.operate==='js'){
-        this.doJs(val)
-      }
       if(this.operate==='jd'){
         this.doJd(val)
       }
       if(this.operate==='jy'){
         this.doJy(val)
       }
+      if(this.operate==='gh'){
+        this.doGh(val)
+      }
     },
   }
 };
diff --git a/src/views/business/archive/nonTrial/list.vue b/src/views/business/archive/nonTrial/list.vue
index 3d87579..15581d7 100644
--- a/src/views/business/archive/nonTrial/list.vue
+++ b/src/views/business/archive/nonTrial/list.vue
@@ -2,18 +2,12 @@
   <div class="app-container study-page">
     <div class="content-list" v-show="showType==='list'">
       <el-form :model="searchForm" ref="searchForm" :inline="true" class="search-box">
-        <el-form-item :label="$t('page.business.study.nonTrial.name')" prop="name">
-          <el-input v-model="searchForm.name" :placeholder="$t('form.placeholderInput')" clearable style="width: 150px" @keyup.enter.native="search" />
-        </el-form-item>
         <el-form-item :label="$t('page.business.study.nonTrial.sn')" prop="sn">
           <el-input v-model="searchForm.sn" :placeholder="$t('form.placeholderInput')" clearable style="width: 150px" @keyup.enter.native="search" />
         </el-form-item>
-
-        <el-form-item :label="$t('page.business.study.nonTrial.dateRange')">
-          <el-date-picker v-model="daterange" clearable type="daterange" range-separator="-" :start-placeholder="$t('page.business.study.nonTrial.startDate')"
-            :end-placeholder="$t('page.business.study.nonTrial.endDate')" value-format="yyyy-MM-dd" @change="search" style="width: 220px" />
+        <el-form-item :label="$t('page.business.study.nonTrial.name')" prop="name">
+          <el-input v-model="searchForm.name" :placeholder="$t('form.placeholderInput')" clearable style="width: 150px" @keyup.enter.native="search" />
         </el-form-item>
-
         <el-form-item prop="status" :label="$t('page.business.study.nonTrial.status')">
           <el-select
             v-model="searchForm.status"
@@ -22,18 +16,12 @@
             style="width: 100px"
             @change="search"
           >
-            <el-option :label="$t('page.business.study.nonTrial.statusCg')" :value="1" />
-            <el-option :label="$t('page.business.study.nonTrial.statusSyz')" :value="3" />
-            <el-option :label="$t('page.business.study.nonTrial.statusYsd')" :value="5" />
             <el-option :label="$t('page.business.study.nonTrial.statusDgd')" :value="7" />
             <el-option :label="$t('page.business.study.nonTrial.statusGd')" :value="9" />
             <el-option :label="$t('page.business.study.nonTrial.statusDjd')" :value="10" />
           </el-select>
         </el-form-item>
 
-        <el-form-item prop="leaderName" :label="$t('page.business.study.nonTrial.leader')">
-          <el-input v-model="searchForm.leaderName" :placeholder="$t('form.placeholderInput')" clearable style="width: 150px" @keyup.enter.native="search" />
-        </el-form-item>
         <div class="right-btn">
           <el-form-item>
             <el-button type="primary" icon="el-icon-search" @click="search">{{ $t('form.search') }}</el-button>
@@ -43,16 +31,10 @@
       </el-form>
 
       <div class="content-box">
-        <el-row class="add-box">
-          <el-col>
-            <el-button type="primary" icon="el-icon-plus" @click="edit(null)" v-hasPermi="['business:form:nonTrial:add']">{{ $t('page.business.study.nonTrial.add') }}</el-button>
-          </el-col>
-        </el-row>
-
         <el-table v-loading="loading" :data="list">
-          <el-table-column :label="$t('page.business.study.nonTrial.sort')" type="index" width="50" />
-          <el-table-column :label="$t('page.business.study.nonTrial.name')" prop="name" />
           <el-table-column :label="$t('page.business.study.nonTrial.sn')" prop="sn" />
+          <el-table-column :label="$t('page.business.study.nonTrial.name')" prop="name" />
+          <el-table-column :label="$t('page.business.study.nonTrial.leader')" align="center" prop="leaderName" width="100" />
           <el-table-column :label="$t('page.business.study.nonTrial.status')" prop="status" width="100">
             <template slot-scope="scope">
               <span v-if="scope.row.status===1"><span class="status-circle cg"></span>{{$t('page.business.study.nonTrial.statusCg')}}</span>
@@ -67,36 +49,31 @@
           <el-table-column :label="$t('page.business.study.nonTrial.borrowStatus')" prop="borrowStatus" width="100">
             <template slot-scope="scope">
               <span v-if="scope.row.borrowStatus===1">{{$t('page.business.study.nonTrial.borrowStatusWjy')}}</span>
-              <span v-if="scope.row.borrowStatus===5">{{$t('page.business.study.nonTrial.borrowStatusJyz')}}</span>
-              <span v-if="scope.row.borrowStatus===10">{{$t('page.business.study.nonTrial.borrowStatusDjy')}}</span>
+              <span v-if="scope.row.borrowStatus===5">{{$t('page.business.study.nonTrial.borrowStatusDjy')}}</span>
+              <span v-if="scope.row.borrowStatus===10">{{$t('page.business.study.nonTrial.borrowStatusJyz')}}</span>
             </template>
           </el-table-column>
 
-          <el-table-column :label="$t('page.business.study.nonTrial.formCount')" align="center" prop="formCount" width="100" />
-          <el-table-column :label="$t('page.business.study.nonTrial.formFinishCount')" align="center" prop="formFinishCount" width="120" />
-          <!-- <el-table-column :label="$t('page.business.study.nonTrial.leader')" align="center"  :prop="$i18n.locale === 'zh_CN'?'leaderName':'leaderNameEn'" width="100" /> -->
-          <el-table-column :label="$t('page.business.study.nonTrial.leader')" align="center" prop="leaderName" width="100" />
-          <el-table-column :label="$t('page.business.study.nonTrial.dept')" align="center" prop="deptName" width="120" />
-          <el-table-column :label="$t('page.business.study.nonTrial.createDate')" align="center" prop="createTime" width="140" />
-          
+          <el-table-column :label="$t('page.business.study.nonTrial.sqgdsj')" align="center" prop="gdApplyTime" width="140" />
+
           <el-table-column :label="$t('form.operate')" fixed="right" align="center" width="200">
             <template slot-scope="scope">
-              <!-- 编辑 -->
-              <el-button type="text" @click="edit(scope.row)" v-hasPermi="['business:form:nonTrial:edit']" v-if="(scope.row.leader==userId || checkRole(['bz'])) && (scope.row.status===1 || scope.row.status===3)">{{$t('page.business.study.nonTrial.edit')}}</el-button>
-              <!-- 删除 -->
-              <el-button type="text" style="color:#E22626" @click="del(scope.row)" v-hasPermi="['business:form:nonTrial:remove']" v-if="(scope.row.leader==userId || checkRole(['bz'])) && scope.row.status===1">{{$t('page.business.study.nonTrial.delete')}}</el-button>
+              <!-- 同意归档 -->
+              <el-button type="text" @click="gd(scope.row,9)" v-hasPermi="['business:archive:trial:tygd']" v-if="scope.row.status===7">{{$t('page.business.study.nonTrial.tygd')}}</el-button>
+              <!-- 拒绝归档 -->
+              <el-button type="text" @click="gd(scope.row,5)" v-hasPermi="['business:archive:trial:jjgd']" v-if="scope.row.status===7">{{$t('page.business.study.nonTrial.jjgd')}}</el-button>
+              <!-- 同意解档 -->
+              <el-button type="text" @click="jd(scope.row,5)" v-hasPermi="['business:archive:trial:tyjd']" v-if="scope.row.status===10">{{$t('page.business.study.nonTrial.tyjd')}}</el-button>
+              <!-- 拒绝解档 -->
+              <el-button type="text" @click="jd(scope.row,9)" v-hasPermi="['business:archive:trial:jjjd']" v-if="scope.row.status===10">{{$t('page.business.study.nonTrial.jjjd')}}</el-button>
+              <!-- 同意借阅 -->
+              <el-button type="text" @click="jy(scope.row,10)" v-hasPermi="['business:archive:trial:tyjy']" v-if="scope.row.status===9 && scope.row.borrowStatus===5">{{$t('page.business.study.nonTrial.tyjy')}}</el-button>
+              <!-- 拒绝借阅 -->
+              <el-button type="text" @click="jy(scope.row,1)" v-hasPermi="['business:archive:trial:jjjy']" v-if="scope.row.status===9 && scope.row.borrowStatus===5">{{$t('page.business.study.nonTrial.jjjy')}}</el-button>
+              <!-- 确认归还 -->
+              <el-button type="text" @click="gh(scope.row)" v-hasPermi="['business:archive:trial:qrgh']" v-if="scope.row.status===9 && scope.row.borrowStatus===10">{{$t('page.business.study.nonTrial.qrgh')}}</el-button>
               <!-- 详情 -->
-              <el-button type="text" @click="detail(scope.row)" v-hasPermi="['business:form:nonTrial:detail']" v-if="scope.row.status===1 || scope.row.status===3 || scope.row.status===5 || (scope.row.status===9 && scope.row.borrowStatus===10)">{{$t('page.business.study.nonTrial.detail')}}</el-button>
-              <!-- 进入试验 -->
-              <el-button type="text" @click="enter(scope.row)" v-hasPermi="['business:form:nonTrial:enter']" v-if="scope.row.status===3 || scope.row.status===5 || (scope.row.status===9 && scope.row.borrowStatus===10)">{{$t('page.business.study.nonTrial.enter')}}</el-button>
-              <!-- 归档 -->
-              <el-button type="text" @click="gd(scope.row)" v-hasPermi="['business:form:nonTrial:gd']" v-if="(scope.row.leader==userId || checkRole(['bz'])) && scope.row.status===5">{{$t('page.business.study.nonTrial.gd')}}</el-button>
-              <!-- 解锁 -->
-              <el-button type="text" @click="js(scope.row)" v-hasPermi="['business:form:nonTrial:js']" v-if="(scope.row.leader==userId || checkRole(['bz'])) && scope.row.status===5">{{$t('page.business.study.nonTrial.js')}}</el-button>
-              <!-- 解档 -->
-              <el-button type="text" @click="jd(scope.row)" v-hasPermi="['business:form:nonTrial:jd']" v-if="(scope.row.leader==userId || checkRole(['bz'])) && scope.row.status===9 && scope.row.borrowStatus===1">{{$t('page.business.study.nonTrial.jd')}}</el-button>
-              <!-- 借阅 -->
-              <el-button type="text" @click="jy(scope.row)" v-hasPermi="['business:form:nonTrial:jy']" v-if="(scope.row.leader==userId || checkRole(['bz'])) && scope.row.status===9 && scope.row.borrowStatus===1">{{$t('page.business.study.nonTrial.jy')}}</el-button>
+              <el-button type="text" @click="detail(scope.row)" v-hasPermi="['business:archive:trial:xq']" >{{$t('page.business.study.nonTrial.detail')}}</el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -109,59 +86,22 @@
           @pagination="getList"
         />
       </div>
-      <!-- <el-dialog :close-on-click-modal="false" :title="infoDialog.title" :visible.sync="infoDialog.visible" width="600px" append-to-body>
-        <el-form ref="infoDialogForm" :model="infoDialog.formData" :rules="infoDialog.rules" label-width="100px">
-          <el-row>
-            <el-col :span="24">
-              <el-form-item :label="$t('page.business.study.nonTrial.name')+'：'" prop="name">
-                <el-input v-model="infoDialog.formData.name" :placeholder="$t('form.placeholderInput')" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="24">
-              <el-form-item :label="$t('page.business.study.nonTrial.sn')+'：'" prop="sn">
-                <el-input v-model="infoDialog.formData.sn" :placeholder="$t('form.placeholderInput')" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="24">
-              <el-form-item :label="$t('page.business.study.nonTrial.leader')+'：'" prop="leader">
-                <el-input v-model="infoDialog.formData.leader" :placeholder="$t('form.placeholderInput')" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="24">
-              <el-form-item :label="$t('page.business.study.nonTrial.remark')+'：'" prop="remark">
-                <el-input type="textarea" :rows="5" :placeholder="$t('form.placeholderInput')" v-model="infoDialog.formData.remark"> </el-input>
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-form>
-        <div slot="footer" class="dialog-footer">
-          <el-button type="primary" @click="save">确 定</el-button>
-          <el-button @click="infoDialog.visible = false">取 消</el-button>
-        </div>
-      </el-dialog> -->
     </div>
 
-    <Edit ref="edit" v-show="showType==='edit'" @cancel="showType='list'" @save="save" />
-    <!-- <Enter ref="enter" v-show="showType==='enter'" @cancel="showType='list'" /> -->
     <Detail ref="detail" v-show="showType==='detail'" @cancel="showType='list'" />
     <Sign ref="signRef" @callback="doSign" />
   </div>
 </template>
 
 <script>
-import { checkPermi, checkRole } from "@/utils/permission";
-import { nonTrial_list,nonTrial_delete,nonTrial_gd,nonTrial_js,nonTrial_jd,nonTrial_jy} from "@/api/business/form/nonTrial";
-import Edit from '@/views/business/form/nonTrial/comp/edit.vue'
-import Enter from '@/views/business/form/nonTrial/comp/enter.vue'
+import { nonTrial_archiveList,nonTrial_doGd,nonTrial_doJd,nonTrial_doJy,nonTrial_gh} from "@/api/business/form/nonTrial";
 import Detail from '@/views/business/form/nonTrial/comp/detail.vue'
-import Sign from '@/views/business/form/nonTrial/comp/sign.vue'
+import Sign from '@/views/business/study/comp/sign.vue'
 export default {
   name: "ArchiveNonTrial",
   props:{
   },
   components:{
-    Edit,
-    Enter,
     Detail,
     Sign
   },
@@ -172,16 +112,12 @@ export default {
   data() {
     return {
       userId:this.$store.getters.id,
-      daterange:[],
       searchForm: {
         pageNum: 1,
         pageSize: 10,
         sn:'',
         name:'',
-        leaderName:'',
         status:'',
-        startDate:'',
-        endDate:'',
       },
 
       loading: true,
@@ -198,13 +134,9 @@ export default {
     this.getList();
   },
   methods: {
-    checkPermi,
-    checkRole,
     getList() {
       this.loading = true;
-      this.searchForm.startDate = this.daterange && this.daterange.length > 0 ? this.daterange[0] : ''
-      this.searchForm.endDate = this.daterange && this.daterange.length > 1 ? this.daterange[1] : ''
-      nonTrial_list(this.searchForm).then(response => {
+      nonTrial_archiveList(this.searchForm).then(response => {
         this.list = response.rows;
         this.total = response.total;
       }).finally(()=>{
@@ -221,64 +153,34 @@ export default {
         pageSize: 10,
         sn:'',
         name:'',
-        leaderName:'',
         status:'',
-        startDate:'',
-        endDate:'',
       }
-      this.daterange = []
       this.search()
     },
-    edit(row) {
-      this.showType = 'edit'
-      this.$refs.edit.edit(row)
-    },
-    save() {
-      this.showType = 'list'
-      this.getList()
-    },
-    enter(row){
-      this.$tab.openPage(" ", '/nonTrial/enter/' + row.id+'/ytbd')
-      // this.showType = 'enter'
-      // this.$refs.enter.show(row)
-    },
     detail(row){
       this.showType = 'detail'
       this.$refs.detail.show(row)
     },
-
-    del(row) {
-      this.operate = 'del'
-      this.operateRow = row
-      this.$refs.signRef.show(this.$t('page.business.study.nonTrial.scsy'),this.$t('page.business.study.nonTrial.scsy'))
-    },
-    doDel(signInfo) {
-      this.$modal.loading()
-      let postData = {
-        study:this.operateRow,
-        sign:signInfo
-      }
-      nonTrial_delete(postData).then(() => {
-        this.$refs.signRef.cancel()
-        this.getList()
-      })
-      .finally(() => {
-        this.$modal.closeLoading()
-      })
-    },
-
-    gd(row) {
+    gd(row,status) {
       this.operate = 'gd'
-      this.operateRow = row
-      this.$refs.signRef.show(this.$t('page.business.study.nonTrial.sqgd'),this.$t('page.business.study.nonTrial.sqgd'))
+      this.operateRow = _.clone(row)
+      this.operateRow.status = status
+      this.$refs.signRef.show(
+        status==9?this.$t('page.business.study.nonTrial.tygd'):this.$t('page.business.study.nonTrial.jjgd'),
+        status==9?this.$t('page.business.study.nonTrial.tygd'):this.$t('page.business.study.nonTrial.jjgd'),
+        false,
+        null,
+        true,
+        status!=9
+      )
     },
     doGd(signInfo) {
       this.$modal.loading()
       let postData = {
-        study:this.operateRow,
+        study: this.operateRow,
         sign:signInfo
       }
-      nonTrial_gd(postData).then(() => {
+      nonTrial_doGd(postData).then(() => {
         this.$refs.signRef.cancel()
         this.getList()
       })
@@ -286,19 +188,26 @@ export default {
         this.$modal.closeLoading()
       })
     },
-
-    js(row) {
-      this.operate = 'js'
-      this.operateRow = row
-      this.$refs.signRef.show(this.$t('page.business.study.nonTrial.jssy'),this.$t('page.business.study.nonTrial.jssy'))
+    jd(row,status) {
+      this.operate = 'jd'
+      this.operateRow = _.clone(row)
+      this.operateRow.status = status
+      this.$refs.signRef.show(
+        status==5?this.$t('page.business.study.nonTrial.tyjd'):this.$t('page.business.study.nonTrial.jjjd'),
+        status==5?this.$t('page.business.study.nonTrial.tyjd'):this.$t('page.business.study.nonTrial.jjjd'),
+        false,
+        null,
+        true,
+        status!=5
+      )
     },
-    doJs(signInfo) {
+    doJd(signInfo) {
       this.$modal.loading()
       let postData = {
         study:this.operateRow,
         sign:signInfo
       }
-      nonTrial_js(postData).then(() => {
+      nonTrial_doJd(postData).then(() => {
         this.$refs.signRef.cancel()
         this.getList()
       })
@@ -307,18 +216,26 @@ export default {
       })
     },
 
-    jd(row) {
-      this.operate = 'jd'
-      this.operateRow = row
-      this.$refs.signRef.show(this.$t('page.business.study.nonTrial.sqjd'),this.$t('page.business.study.nonTrial.sqjd'))
+    jy(row,status) {
+      this.operate = 'jy'
+      this.operateRow = _.clone(row)
+      this.operateRow.borrowStatus = status
+      this.$refs.signRef.show(
+        status==10?this.$t('page.business.study.nonTrial.tyjy'):this.$t('page.business.study.nonTrial.jjjy'),
+        status==10?this.$t('page.business.study.nonTrial.tyjy'):this.$t('page.business.study.nonTrial.jjjy'),
+        true,
+        [row.borrowStartDate,row.borrowEndDate],
+        true,
+        status!=10
+      )
     },
-    doJd(signInfo) {
+    doJy(signInfo) {
       this.$modal.loading()
       let postData = {
         study:this.operateRow,
         sign:signInfo
       }
-      nonTrial_jd(postData).then(() => {
+      nonTrial_doJy(postData).then(() => {
         this.$refs.signRef.cancel()
         this.getList()
       })
@@ -327,18 +244,25 @@ export default {
       })
     },
 
-    jy(row) {
-      this.operate = 'jy'
+    gh(row) {
+      this.operate = 'gh'
       this.operateRow = row
-      this.$refs.signRef.show(this.$t('page.business.study.nonTrial.sqjy'),this.$t('page.business.study.nonTrial.sqjy'),true)
+      this.$refs.signRef.show(
+        this.$t('page.business.study.nonTrial.qrgh'),
+        this.$t('page.business.study.nonTrial.qrgh'),
+        false,
+        null,
+        false,
+        false
+      )
     },
-    doJy(signInfo) {
+    doGh(signInfo) {
       this.$modal.loading()
       let postData = {
         study:this.operateRow,
         sign:signInfo
       }
-      nonTrial_jy(postData).then(() => {
+      nonTrial_gh(postData).then(() => {
         this.$refs.signRef.cancel()
         this.getList()
       })
@@ -347,23 +271,19 @@ export default {
       })
     },
 
-
     doSign(val){
-      if(this.operate==='del'){
-        this.doDel(val)
-      }
       if(this.operate==='gd'){
         this.doGd(val)
       }
-      if(this.operate==='js'){
-        this.doJs(val)
-      }
       if(this.operate==='jd'){
         this.doJd(val)
       }
       if(this.operate==='jy'){
         this.doJy(val)
       }
+      if(this.operate==='gh'){
+        this.doGh(val)
+      }
     },
   }
 };
diff --git a/src/views/business/archive/trial/list.vue b/src/views/business/archive/trial/list.vue
index 0f465af..db9ab42 100644
--- a/src/views/business/archive/trial/list.vue
+++ b/src/views/business/archive/trial/list.vue
@@ -16,9 +16,6 @@
             style="width: 100px"
             @change="search"
           >
-            <el-option :label="$t('page.business.study.study.statusCg')" :value="1" />
-            <el-option :label="$t('page.business.study.study.statusSyz')" :value="3" />
-            <el-option :label="$t('page.business.study.study.statusYsd')" :value="5" />
             <el-option :label="$t('page.business.study.study.statusDgd')" :value="7" />
             <el-option :label="$t('page.business.study.study.statusGd')" :value="9" />
             <el-option :label="$t('page.business.study.study.statusDjd')" :value="10" />
@@ -34,12 +31,6 @@
       </el-form>
 
       <div class="content-box">
-        <el-row class="add-box">
-          <el-col>
-            <el-button type="primary" icon="el-icon-plus" @click="edit(null)" v-hasPermi="['business:study:add']">{{ $t('page.business.study.study.add') }}</el-button>
-          </el-col>
-        </el-row>
-
         <el-table v-loading="loading" :data="list">
           <el-table-column :label="$t('page.business.study.study.sn')" prop="sn" />
           <el-table-column :label="$t('page.business.study.study.name')" prop="name" />
@@ -54,13 +45,12 @@
               <span v-if="scope.row.status===10"><span class="status-circle"></span>{{$t('page.business.study.study.statusDjd')}}</span>
             </template>
           </el-table-column>
-          
 
           <el-table-column :label="$t('page.business.study.study.borrowStatus')" prop="borrowStatus" width="100">
             <template slot-scope="scope">
               <span v-if="scope.row.borrowStatus===1">{{$t('page.business.study.study.borrowStatusWjy')}}</span>
-              <span v-if="scope.row.borrowStatus===5">{{$t('page.business.study.study.borrowStatusJyz')}}</span>
-              <span v-if="scope.row.borrowStatus===10">{{$t('page.business.study.study.borrowStatusDjy')}}</span>
+              <span v-if="scope.row.borrowStatus===5">{{$t('page.business.study.study.borrowStatusDjy')}}</span>
+              <span v-if="scope.row.borrowStatus===10">{{$t('page.business.study.study.borrowStatusJyz')}}</span>
             </template>
           </el-table-column>
 
diff --git a/src/views/business/form/drug/comp/detail.vue b/src/views/business/form/drug/comp/detail.vue
index 823ba56..99947e4 100644
--- a/src/views/business/form/drug/comp/detail.vue
+++ b/src/views/business/form/drug/comp/detail.vue
@@ -60,8 +60,8 @@
               <div class="left-title">{{ $t('page.business.study.drug.borrowStatus') }}</div>
               <el-select v-model="form.borrowStatus" disabled style="width: 100%;">
                 <el-option :label="$t('page.business.study.drug.borrowStatusWjy')" :value="1" />
-                <el-option :label="$t('page.business.study.drug.borrowStatusJyz')" :value="5" />
-                <el-option :label="$t('page.business.study.drug.borrowStatusDjy')" :value="10" />
+                <el-option :label="$t('page.business.study.drug.borrowStatusDjy')" :value="5" />
+                <el-option :label="$t('page.business.study.drug.borrowStatusJyz')" :value="10" />
               </el-select>
             </div>
           </div>
diff --git a/src/views/business/form/drug/list.vue b/src/views/business/form/drug/list.vue
index 239f6ea..3480fc8 100644
--- a/src/views/business/form/drug/list.vue
+++ b/src/views/business/form/drug/list.vue
@@ -67,8 +67,8 @@
           <el-table-column :label="$t('page.business.study.drug.borrowStatus')" prop="borrowStatus" width="100">
             <template slot-scope="scope">
               <span v-if="scope.row.borrowStatus===1">{{$t('page.business.study.drug.borrowStatusWjy')}}</span>
-              <span v-if="scope.row.borrowStatus===5">{{$t('page.business.study.drug.borrowStatusJyz')}}</span>
-              <span v-if="scope.row.borrowStatus===10">{{$t('page.business.study.drug.borrowStatusDjy')}}</span>
+              <span v-if="scope.row.borrowStatus===5">{{$t('page.business.study.drug.borrowStatusDjy')}}</span>
+              <span v-if="scope.row.borrowStatus===10">{{$t('page.business.study.drug.borrowStatusJyz')}}</span>
             </template>
           </el-table-column>
 
diff --git a/src/views/business/form/nonTrial/comp/detail.vue b/src/views/business/form/nonTrial/comp/detail.vue
index 7f284cc..82cd4eb 100644
--- a/src/views/business/form/nonTrial/comp/detail.vue
+++ b/src/views/business/form/nonTrial/comp/detail.vue
@@ -60,8 +60,8 @@
               <div class="left-title">{{ $t('page.business.study.nonTrial.borrowStatus') }}</div>
               <el-select v-model="form.borrowStatus" disabled style="width: 100%;">
                 <el-option :label="$t('page.business.study.nonTrial.borrowStatusWjy')" :value="1" />
-                <el-option :label="$t('page.business.study.nonTrial.borrowStatusJyz')" :value="5" />
-                <el-option :label="$t('page.business.study.nonTrial.borrowStatusDjy')" :value="10" />
+                <el-option :label="$t('page.business.study.nonTrial.borrowStatusDjy')" :value="5" />
+                <el-option :label="$t('page.business.study.nonTrial.borrowStatusJyz')" :value="10" />
               </el-select>
             </div>
           </div>
diff --git a/src/views/business/form/nonTrial/comp/ytbdList.vue b/src/views/business/form/nonTrial/comp/ytbdList.vue
index f15cdb8..b82b386 100644
--- a/src/views/business/form/nonTrial/comp/ytbdList.vue
+++ b/src/views/business/form/nonTrial/comp/ytbdList.vue
@@ -52,7 +52,6 @@
             <el-button type="primary" icon="el-icon-plus" @click="showAdd()"
               v-hasPermi="['business:nonTrialFormPre:xz']">{{
                 $t('page.business.study.studyFormPre.xzbd') }}</el-button>
-
             <el-button type="primary" @click="sdsy" v-hasPermi="['business:form:nonTrial:sd']"
               v-if="(leader == id || checkRole(['bz'])) && studyStatus != 5 && formCount === formFinishCount">{{
                 $t('page.business.study.nonTrial.sdsy') }}</el-button>
diff --git a/src/views/business/form/nonTrial/list.vue b/src/views/business/form/nonTrial/list.vue
index 4e3b80c..747e332 100644
--- a/src/views/business/form/nonTrial/list.vue
+++ b/src/views/business/form/nonTrial/list.vue
@@ -67,8 +67,8 @@
           <el-table-column :label="$t('page.business.study.nonTrial.borrowStatus')" prop="borrowStatus" width="100">
             <template slot-scope="scope">
               <span v-if="scope.row.borrowStatus===1">{{$t('page.business.study.nonTrial.borrowStatusWjy')}}</span>
-              <span v-if="scope.row.borrowStatus===5">{{$t('page.business.study.nonTrial.borrowStatusJyz')}}</span>
-              <span v-if="scope.row.borrowStatus===10">{{$t('page.business.study.nonTrial.borrowStatusDjy')}}</span>
+              <span v-if="scope.row.borrowStatus===5">{{$t('page.business.study.nonTrial.borrowStatusDjy')}}</span>
+              <span v-if="scope.row.borrowStatus===10">{{$t('page.business.study.nonTrial.borrowStatusJyz')}}</span>
             </template>
           </el-table-column>
 
diff --git a/src/views/business/resource/mjy/comps/mjyList.vue b/src/views/business/resource/mjy/comps/mjyList.vue
index 5404211..2a69cc6 100644
--- a/src/views/business/resource/mjy/comps/mjyList.vue
+++ b/src/views/business/resource/mjy/comps/mjyList.vue
@@ -132,7 +132,7 @@
           <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.zjzt == 1 || scope.row.zjzt == 3 || scope.row.zjzt == 5 || scope.row.zjzt == 9">
+              <template v-if="scope.row.zjzt == 1 || scope.row.zjzt == 3 || scope.row.zjzt == 5 || scope.row.jyzt == 5 ">
                 <!-- 详情 -->
                 <el-button type="text" @click="handleXq(scope.row)" v-hasPermi="['business:resource:mjy:xq']">{{
                   $t('page.business.resource.mjy.detail') }}</el-button>
@@ -188,7 +188,7 @@
                 <el-button type="text" @click="handleRk(scope.row)" v-hasPermi="['business:resource:mjy:rk']">{{
                   $t('page.business.resource.mjy.ruku') }}</el-button>
               </template>
-              <template v-if="scope.row.zjzt == 9">
+              <template v-if="scope.row.zjzt == 9&&scope.row.jyzt == 1">
                 <!-- 解档 -->
                 <el-button type="text" @click="handleJd(scope.row)" v-hasPermi="['business:resource:mjy:jd']">{{
                   $t('page.business.resource.mjy.jiedang') }}</el-button>
diff --git a/src/views/business/study/comp/detail.vue b/src/views/business/study/comp/detail.vue
index 18bc8a8..564ef77 100644
--- a/src/views/business/study/comp/detail.vue
+++ b/src/views/business/study/comp/detail.vue
@@ -60,8 +60,8 @@
               <div class="left-title">{{ $t('page.business.study.study.borrowStatus') }}</div>
               <el-select v-model="form.borrowStatus" disabled style="width: 100%;">
                 <el-option :label="$t('page.business.study.study.borrowStatusWjy')" :value="1" />
-                <el-option :label="$t('page.business.study.study.borrowStatusJyz')" :value="5" />
-                <el-option :label="$t('page.business.study.study.borrowStatusDjy')" :value="10" />
+                <el-option :label="$t('page.business.study.study.borrowStatusDjy')" :value="5" />
+                <el-option :label="$t('page.business.study.study.borrowStatusJyz')" :value="10" />
               </el-select>
             </div>
           </div>
diff --git a/src/views/business/study/comp/sign.vue b/src/views/business/study/comp/sign.vue
index 4d4850e..429506c 100644
--- a/src/views/business/study/comp/sign.vue
+++ b/src/views/business/study/comp/sign.vue
@@ -110,8 +110,8 @@ export default {
         qmrMc:this.$store.getters.nickName,
         qmrMcEn:this.$store.getters.name,
         qmrmm:'',
-        startDate:'',
-        endDate:''
+        startDate:selectedDate&&selectedDate.length>0?selectedDate[0]:'',
+        endDate:selectedDate&&selectedDate.length>1?selectedDate[1]:''
       }
       this.resetForm("signForm")
       this.open = true
diff --git a/src/views/business/study/list.vue b/src/views/business/study/list.vue
index d0f74f1..b60bad6 100644
--- a/src/views/business/study/list.vue
+++ b/src/views/business/study/list.vue
@@ -67,8 +67,8 @@
           <el-table-column :label="$t('page.business.study.study.borrowStatus')" prop="borrowStatus" width="100">
             <template slot-scope="scope">
               <span v-if="scope.row.borrowStatus===1">{{$t('page.business.study.study.borrowStatusWjy')}}</span>
-              <span v-if="scope.row.borrowStatus===5">{{$t('page.business.study.study.borrowStatusJyz')}}</span>
-              <span v-if="scope.row.borrowStatus===10">{{$t('page.business.study.study.borrowStatusDjy')}}</span>
+              <span v-if="scope.row.borrowStatus===5">{{$t('page.business.study.study.borrowStatusDjy')}}</span>
+              <span v-if="scope.row.borrowStatus===10">{{$t('page.business.study.study.borrowStatusJyz')}}</span>
             </template>
           </el-table-column>