From 131e5b011cfc259e4062f6037479ce4da4da67f4 Mon Sep 17 00:00:00 2001
From: memorylkf <312904636@qq.com>
Date: Thu, 22 Jan 2026 20:23:46 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20[=E6=A1=A3=E6=A1=88=E7=AE=A1=E7=90=86]?=
 =?UTF-8?q?=20=E8=AF=95=E9=AA=8C=E6=A1=A3=E6=A1=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/business/archive/drugConfig/list.vue     | 244 +++++++--------------
 src/views/business/archive/nonTrial/list.vue       | 244 +++++++--------------
 src/views/business/archive/trial/list.vue          |  14 +-
 src/views/business/form/drug/comp/detail.vue       |   4 +-
 src/views/business/form/drug/list.vue              |   4 +-
 src/views/business/form/nonTrial/comp/detail.vue   |   4 +-
 src/views/business/form/nonTrial/comp/ytbdList.vue |   1 -
 src/views/business/form/nonTrial/list.vue          |   4 +-
 src/views/business/study/comp/detail.vue           |   4 +-
 src/views/business/study/comp/sign.vue             |   4 +-
 src/views/business/study/list.vue                  |   4 +-
 11 files changed, 180 insertions(+), 351 deletions(-)

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/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>