From 14e81232778f417a2ba5a8502485c65cee49cb00 Mon Sep 17 00:00:00 2001
From: memorylkf <312904636@qq.com>
Date: Thu, 22 Jan 2026 16:33:31 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20[=E6=A1=A3=E6=A1=88=E7=AE=A1=E7=90=86]?=
 =?UTF-8?q?=20=E5=88=97=E8=A1=A8=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/lang/en/business/study/drug.js        |  7 ++--
 src/lang/en/business/study/nonTrial.js    |  7 ++--
 src/lang/en/business/study/study.js       |  9 +++--
 src/lang/zh/business/study/drug.js        |  5 ++-
 src/lang/zh/business/study/nonTrial.js    |  5 ++-
 src/lang/zh/business/study/study.js       |  5 ++-
 src/views/business/archive/trial/list.vue | 58 ++++++++++++-------------------
 7 files changed, 51 insertions(+), 45 deletions(-)

diff --git a/src/lang/en/business/study/drug.js b/src/lang/en/business/study/drug.js
index 0861967..7f80ee2 100644
--- a/src/lang/en/business/study/drug.js
+++ b/src/lang/en/business/study/drug.js
@@ -59,8 +59,10 @@ export default {
   tyjd: 'Approve De-archiving',
   jjgd: 'Reject Archiving',
   tygd: 'Approve Archiving',
+  tyjy: 'Approve Check-out',
+  jjjy: 'Reject Check-out',
   dqzdgh: 'Check-out End on Time',
-  qrgh: 'Check-out End Confirmation',
+  qrgh: 'Confirm Check-in',
 
   qb: 'All',
   lc: 'Milestone',
@@ -68,5 +70,6 @@ export default {
   ry: 'User',
 
   scsy: 'Remove',
-  jysj: 'Checkout Period'
+  jysj: 'Checkout Period',
+  sqgdsj: 'Archive Application Date'
 }
diff --git a/src/lang/en/business/study/nonTrial.js b/src/lang/en/business/study/nonTrial.js
index 0861967..7f80ee2 100644
--- a/src/lang/en/business/study/nonTrial.js
+++ b/src/lang/en/business/study/nonTrial.js
@@ -59,8 +59,10 @@ export default {
   tyjd: 'Approve De-archiving',
   jjgd: 'Reject Archiving',
   tygd: 'Approve Archiving',
+  tyjy: 'Approve Check-out',
+  jjjy: 'Reject Check-out',
   dqzdgh: 'Check-out End on Time',
-  qrgh: 'Check-out End Confirmation',
+  qrgh: 'Confirm Check-in',
 
   qb: 'All',
   lc: 'Milestone',
@@ -68,5 +70,6 @@ export default {
   ry: 'User',
 
   scsy: 'Remove',
-  jysj: 'Checkout Period'
+  jysj: 'Checkout Period',
+  sqgdsj: 'Archive Application Date'
 }
diff --git a/src/lang/en/business/study/study.js b/src/lang/en/business/study/study.js
index 405e5cf..9e83f86 100644
--- a/src/lang/en/business/study/study.js
+++ b/src/lang/en/business/study/study.js
@@ -59,8 +59,10 @@ export default {
   tyjd: 'Approve De-archiving',
   jjgd: 'Reject Archiving',
   tygd: 'Approve Archiving',
+  tyjy: 'Approve Check-out',
+  jjjy: 'Reject Check-out',
   dqzdgh: 'Check-out End on Time',
-  qrgh: 'Check-out End Confirmation',
+  qrgh: 'Confirm Check-in',
 
   qb: 'All',
   lc: 'Milestone',
@@ -72,6 +74,7 @@ export default {
   jysj: 'Checkout Period',
 
   qxzsy: 'Please Select Study',
-  
-  other:'Other'
+
+  other: 'Other',
+  sqgdsj: 'Archive Application Date'
 }
diff --git a/src/lang/zh/business/study/drug.js b/src/lang/zh/business/study/drug.js
index 2494336..69c0874 100644
--- a/src/lang/zh/business/study/drug.js
+++ b/src/lang/zh/business/study/drug.js
@@ -59,6 +59,8 @@ export default {
   tyjd: '同意解档',
   jjgd: '拒绝归档',
   tygd: '同意归档',
+  tyjy: '同意借阅',
+  jjjy: '拒绝借阅',
   dqzdgh: '到期自动归还',
   qrgh: '确认归还',
 
@@ -69,5 +71,6 @@ export default {
   xg: '修改',
 
   scsy: '删除麻精药文件夹',
-  jysj: '借阅时间'
+  jysj: '借阅时间',
+  sqgdsj: '申请归档时间'
 }
diff --git a/src/lang/zh/business/study/nonTrial.js b/src/lang/zh/business/study/nonTrial.js
index 5df9542..7398364 100644
--- a/src/lang/zh/business/study/nonTrial.js
+++ b/src/lang/zh/business/study/nonTrial.js
@@ -59,6 +59,8 @@ export default {
   tyjd: '同意解档',
   jjgd: '拒绝归档',
   tygd: '同意归档',
+  tyjy: '同意借阅',
+  jjjy: '拒绝借阅',
   dqzdgh: '到期自动归还',
   qrgh: '确认归还',
 
@@ -69,5 +71,6 @@ export default {
   xg: '修改',
 
   scsy: '删除非试验',
-  jysj: '借阅时间'
+  jysj: '借阅时间',
+  sqgdsj: '申请归档时间'
 }
diff --git a/src/lang/zh/business/study/study.js b/src/lang/zh/business/study/study.js
index 4e1beee..9674d93 100644
--- a/src/lang/zh/business/study/study.js
+++ b/src/lang/zh/business/study/study.js
@@ -59,6 +59,8 @@ export default {
   tyjd: '同意解档',
   jjgd: '拒绝归档',
   tygd: '同意归档',
+  tyjy: '同意借阅',
+  jjjy: '拒绝借阅',
   dqzdgh: '到期自动归还',
   qrgh: '确认归还',
 
@@ -72,5 +74,6 @@ export default {
   jysj: '借阅时间',
 
   qxzsy: '请选择试验',
-  other:'其他'
+  other: '其他',
+  sqgdsj: '申请归档时间'
 }
diff --git a/src/views/business/archive/trial/list.vue b/src/views/business/archive/trial/list.vue
index 000576c..0e3eeb5 100644
--- a/src/views/business/archive/trial/list.vue
+++ b/src/views/business/archive/trial/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.study.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.study.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.study.dateRange')">
-          <el-date-picker v-model="daterange" clearable type="daterange" range-separator="-" :start-placeholder="$t('page.business.study.study.startDate')"
-            :end-placeholder="$t('page.business.study.study.endDate')" value-format="yyyy-MM-dd" @change="search" style="width: 220px" />
+        <el-form-item :label="$t('page.business.study.study.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.study.status')">
           <el-select
             v-model="searchForm.status"
@@ -31,9 +25,6 @@
           </el-select>
         </el-form-item>
 
-        <el-form-item prop="leaderName" :label="$t('page.business.study.study.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('page.business.study.study.search') }}</el-button>
@@ -50,9 +41,9 @@
         </el-row>
 
         <el-table v-loading="loading" :data="list">
-          <el-table-column :label="$t('page.business.study.study.sort')" type="index" width="50" />
-          <el-table-column :label="$t('page.business.study.study.name')" prop="name" />
           <el-table-column :label="$t('page.business.study.study.sn')" prop="sn" />
+          <el-table-column :label="$t('page.business.study.study.name')" prop="name" />
+          <el-table-column :label="$t('page.business.study.study.leader')" align="center" prop="leaderName" width="100" />
           <el-table-column :label="$t('page.business.study.study.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.study.statusCg')}}</span>
@@ -63,6 +54,7 @@
               <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">
@@ -72,30 +64,26 @@
             </template>
           </el-table-column>
 
-          <el-table-column :label="$t('page.business.study.study.formCount')" align="center" prop="formCount" width="100" />
-          <el-table-column :label="$t('page.business.study.study.formFinishCount')" align="center" prop="formFinishCount" width="120" />
-          <!-- <el-table-column :label="$t('page.business.study.study.leader')" align="center" :prop="$i18n.locale === 'zh_CN'?'leaderName':'leaderNameEn'" width="100" /> -->
-          <el-table-column :label="$t('page.business.study.study.leader')" align="center" prop="leaderName" width="100" />
-          <el-table-column :label="$t('page.business.study.study.createDate')" align="center" prop="createTime" width="140" />
+          <el-table-column :label="$t('page.business.study.study.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:study:edit']" v-if="(scope.row.leader==userId || checkRole(['TFM'])) && (scope.row.status===1 || scope.row.status===3)">{{$t('page.business.study.study.edit')}}</el-button>
-              <!-- 删除 -->
-              <el-button type="text" style="color:#E22626" @click="del(scope.row)" v-hasPermi="['business:study:remove']" v-if="(scope.row.leader==userId || checkRole(['TFM'])) && scope.row.status===1">{{$t('page.business.study.study.delete')}}</el-button>
+              <!-- 同意归档 -->
+              <el-button type="text" @click="doGd(scope.row,9)" v-hasPermi="['business:archive:trial:tygd']" v-if="scope.row.status===7">{{$t('page.business.study.study.edit')}}</el-button>
+              <!-- 拒绝归档 -->
+              <el-button type="text" @click="doGd(scope.row,5)" v-hasPermi="['business:archive:trial:jjgd']" v-if="scope.row.status===7">{{$t('page.business.study.study.delete')}}</el-button>
+              <!-- 同意解档 -->
+              <el-button type="text" @click="doJd(scope.row,5)" v-hasPermi="['business:archive:trial:tyjd']" v-if="scope.row.status===10">{{$t('page.business.study.study.enter')}}</el-button>
+              <!-- 拒绝解档 -->
+              <el-button type="text" @click="doJd(scope.row,9)" v-hasPermi="['business:archive:trial:jjjd']" v-if="scope.row.status===10">{{$t('page.business.study.study.gd')}}</el-button>
+              <!-- 同意借阅 -->
+              <el-button type="text" @click="doJy(scope.row,10)" v-hasPermi="['business:archive:trial:tyjy']" v-if="scope.row.status===9 && scope.row.borrowStatus===5">{{$t('page.business.study.study.js')}}</el-button>
+              <!-- 拒绝借阅 -->
+              <el-button type="text" @click="doJy(scope.row,1)" v-hasPermi="['business:archive:trial:jjjy']" v-if="scope.row.status===9 && scope.row.borrowStatus===5">{{$t('page.business.study.study.jy')}}</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.study.jd')}}</el-button>
               <!-- 详情 -->
-              <el-button type="text" @click="detail(scope.row)" v-hasPermi="['business:study: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.study.detail')}}</el-button>
-              <!-- 进入试验 -->
-              <el-button type="text" @click="enter(scope.row)" v-hasPermi="['business:study:enter']" v-if="scope.row.status===3 || scope.row.status===5 || (scope.row.status===9 && scope.row.borrowStatus===10)">{{$t('page.business.study.study.enter')}}</el-button>
-              <!-- 归档 -->
-              <el-button type="text" @click="gd(scope.row)" v-hasPermi="['business:study:gd']" v-if="(scope.row.leader==userId || checkRole(['TFM'])) && scope.row.status===5">{{$t('page.business.study.study.gd')}}</el-button>
-              <!-- 解锁 -->
-              <el-button type="text" @click="js(scope.row)" v-hasPermi="['business:study:js']" v-if="(scope.row.leader==userId || checkRole(['TFM'])) && scope.row.status===5">{{$t('page.business.study.study.js')}}</el-button>
-              <!-- 解档 -->
-              <el-button type="text" @click="jd(scope.row)" v-hasPermi="['business:study:jd']" v-if="(scope.row.leader==userId || checkRole(['TFM'])) && scope.row.status===9 && scope.row.borrowStatus===1">{{$t('page.business.study.study.jd')}}</el-button>
-              <!-- 借阅 -->
-              <el-button type="text" @click="jy(scope.row)" v-hasPermi="['business:study:jy']" v-if="(scope.row.leader==userId || checkRole(['TFM'])) && scope.row.status===9 && scope.row.borrowStatus===1">{{$t('page.business.study.study.jy')}}</el-button>
+              <el-button type="text" @click="detail(scope.row)" v-hasPermi="['business:archive:trial:xq']" >{{$t('page.business.study.study.detail')}}</el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -149,7 +137,7 @@
 
 <script>
 import { checkPermi, checkRole } from "@/utils/permission";
-import { study_list,study_delete,study_gd,study_js,study_jd,study_jy} from "@/api/business/study/study";
+import { study_archiveList,study_delete,study_gd,study_js,study_jd,study_jy} from "@/api/business/study/study";
 import Edit from '@/views/business/study/comp/edit.vue'
 import Enter from '@/views/business/study/comp/enter.vue'
 import Detail from '@/views/business/study/comp/detail.vue'
@@ -203,7 +191,7 @@ export default {
       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] : ''
-      study_list(this.searchForm).then(response => {
+      study_archiveList(this.searchForm).then(response => {
         this.list = response.rows;
         this.total = response.total;
       }).finally(()=>{