From 6a5c80df66d45808c9003058195f6fb68f161a2e Mon Sep 17 00:00:00 2001
From: memorylkf <312904636@qq.com>
Date: Fri, 26 Dec 2025 12:11:46 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20[=E8=AF=95=E9=AA=8C=E7=AE=A1=E7=90=86]?=
 =?UTF-8?q?=20[=E9=A2=84=E5=A1=AB=E8=A1=A8=E5=8D=95]=20=E9=A2=84=E5=A1=AB?=
 =?UTF-8?q?=E8=A1=A8=E5=8D=95=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/lang/en.js                             |   6 +-
 src/lang/en/business/form/form.js          |  22 +++++
 src/lang/en/business/study/studyEnter.js   |   5 +-
 src/lang/zh.js                             |   6 +-
 src/lang/zh/business/form/form.js          |  22 +++++
 src/lang/zh/business/study/studyEnter.js   |   5 +-
 src/views/business/study/comp/suject.vue   |   4 +-
 src/views/business/study/comp/ytbd.vue     |  15 +--
 src/views/business/study/comp/ytbdList.vue | 145 +++++++++++++++++++++++++++++
 9 files changed, 212 insertions(+), 18 deletions(-)
 create mode 100644 src/lang/en/business/form/form.js
 create mode 100644 src/lang/zh/business/form/form.js
 create mode 100644 src/views/business/study/comp/ytbdList.vue

diff --git a/src/lang/en.js b/src/lang/en.js
index c235557..e53b266 100644
--- a/src/lang/en.js
+++ b/src/lang/en.js
@@ -14,6 +14,9 @@ import template from './en/system/template'
 import study from './en/business/study/study'
 import studyEnter from './en/business/study/studyEnter'
 
+//表单
+import form from './en/business/form/form'
+
 //资源库管理
 // 仪器管理
 import yq from './en/business/resource/yq/yq'
@@ -136,7 +139,8 @@ export default {
       study: {
         study: study,
         studyEnter: studyEnter
-      }
+      },
+      form: form
     }
   }
 }
diff --git a/src/lang/en/business/form/form.js b/src/lang/en/business/form/form.js
new file mode 100644
index 0000000..de9f347
--- /dev/null
+++ b/src/lang/en/business/form/form.js
@@ -0,0 +1,22 @@
+export default {
+  xzytbd: 'Create Form',
+  bdmc: 'Record Name',
+  bdbh: 'Record ID',
+  gsr: 'Owner',
+  xtmbmc: 'Form Type',
+  cjsj: 'Created On',
+  startDate: 'Start Date',
+  endDate: 'End Date',
+  bh: 'Form ID',
+  cjr: 'Creator',
+
+  status: 'Status',
+
+  statusTbz: 'On-going',
+  statusYtj: 'Submitted',
+  statusYtg: 'Approved',
+  statusWtg: 'Rejected',
+
+  audit: 'Approve',
+  detail: 'Enter'
+}
diff --git a/src/lang/en/business/study/studyEnter.js b/src/lang/en/business/study/studyEnter.js
index 625db0d..a8e7310 100644
--- a/src/lang/en/business/study/studyEnter.js
+++ b/src/lang/en/business/study/studyEnter.js
@@ -4,5 +4,8 @@ export default {
   syxx: 'Information',
   wzlb: 'Resources',
   syfflb: 'Method',
-  syjsygl: 'Animal Room Usage'
+  syjsygl: 'Animal Room Usage',
+
+  syxkxx: 'Disciplin',
+  yq: 'Invite'
 }
diff --git a/src/lang/zh.js b/src/lang/zh.js
index 2ff8bef..12598d4 100644
--- a/src/lang/zh.js
+++ b/src/lang/zh.js
@@ -14,6 +14,9 @@ import template from './zh/system/template'
 import study from './zh/business/study/study'
 import studyEnter from './zh/business/study/studyEnter'
 
+//表单
+import form from './zh/business/form/form'
+
 //资源库管理
 // 仪器管理
 import yq from './zh/business/resource/yq/yq'
@@ -133,7 +136,8 @@ export default {
       study: {
         study: study,
         studyEnter: studyEnter
-      }
+      },
+      form: form
     }
   }
 }
diff --git a/src/lang/zh/business/form/form.js b/src/lang/zh/business/form/form.js
new file mode 100644
index 0000000..a1e51dc
--- /dev/null
+++ b/src/lang/zh/business/form/form.js
@@ -0,0 +1,22 @@
+export default {
+  xzytbd: '新增预填表单',
+  bdmc: '表单名称',
+  bdbh: '表单编号',
+  gsr: '归属人',
+  xtmbmc: '系统模板名称',
+  cjsj: '创建时间',
+  startDate: '开始时间',
+  endDate: '结束时间',
+  bh: '编号',
+  cjr: '创建人',
+
+  status: '表单状态',
+
+  statusTbz: '填报中',
+  statusYtj: '已提交',
+  statusYtg: '已通过',
+  statusWtg: '未通过',
+
+  audit: '审核',
+  detail: '表单详情'
+}
diff --git a/src/lang/zh/business/study/studyEnter.js b/src/lang/zh/business/study/studyEnter.js
index e65b5aa..f824869 100644
--- a/src/lang/zh/business/study/studyEnter.js
+++ b/src/lang/zh/business/study/studyEnter.js
@@ -4,5 +4,8 @@ export default {
   syxx: '试验信息',
   wzlb: '物资列表',
   syfflb: '试验方法列表',
-  syjsygl: '饲养间使用管理'
+  syjsygl: '饲养间使用管理',
+
+  syxkxx: '试验学科信息',
+  yq: '邀请'
 }
diff --git a/src/views/business/study/comp/suject.vue b/src/views/business/study/comp/suject.vue
index 33e3730..c6376a5 100644
--- a/src/views/business/study/comp/suject.vue
+++ b/src/views/business/study/comp/suject.vue
@@ -8,7 +8,7 @@
     </div>
     <div class="subject-operate">
       <div class="operate-img"></div>
-      <div class="operate-left">试验学科信息</div>
+      <div class="operate-left">{{$t('page.business.study.studyEnter.syxkxx')}}</div>
       <div class="operate-right">
         <i class="el-icon-edit operate-icon"></i>
       </div>
@@ -17,7 +17,7 @@
       <div class="subject-item" v-for="(item,index) in  subjectList" :key="index">
         <div class="subject-item-name">{{item.name}}({{item.leader}})</div>
         <div class="subject-item-add">
-          <el-button type="primary" plain>邀请</el-button>
+          <el-button type="primary" plain>{{$t('page.business.study.studyEnter.yq')}}</el-button>
         </div>
       </div>
     </div>
diff --git a/src/views/business/study/comp/ytbd.vue b/src/views/business/study/comp/ytbd.vue
index df5683a..0320ce7 100644
--- a/src/views/business/study/comp/ytbd.vue
+++ b/src/views/business/study/comp/ytbd.vue
@@ -4,14 +4,14 @@
       <sbject :study="study" />
     </div>
     <div class="ytbd-right">
-      <div class="right-top">456</div>
-      <div class="right-content">789</div>
+      <ytbdList :study="study" />
     </div>
   </div>
 </template>
 
 <script>
 import sbject from './suject.vue'
+import ytbdList from './ytbdList.vue'
 export default {
   name: 'StudyYtbd',
   props: {
@@ -22,7 +22,7 @@ export default {
       }
     }
   },
-  components: {sbject},
+  components: {sbject,ytbdList},
   computed: {},
   filters: {},
   data() {
@@ -47,15 +47,6 @@ export default {
   }
   .ytbd-right{
     flex-grow: 1;
-    .right-top{
-      background: #fff;
-      padding: 20px;
-      margin-bottom: 10px;
-    }
-    .right-content{
-      padding: 20px;
-      background: #fff;
-    }
   }
 }
 </style>
diff --git a/src/views/business/study/comp/ytbdList.vue b/src/views/business/study/comp/ytbdList.vue
new file mode 100644
index 0000000..36e292a
--- /dev/null
+++ b/src/views/business/study/comp/ytbdList.vue
@@ -0,0 +1,145 @@
+<template>
+  <div class="ytbd-list">
+    <div class="ytbd-search">
+      <el-form :model="searchForm" ref="searchForm" :inline="true">
+        <el-form-item :label="$t('page.business.form.bdmc')" 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.form.bdbh')" 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.form.gsr')" prop="ownerName">
+          <el-input v-model="searchForm.ownerName" :placeholder="$t('form.placeholderInput')" clearable style="width: 150px" @keyup.enter.native="search" />
+        </el-form-item>
+         <el-form-item :label="$t('page.business.form.xtmbmc')" prop="templateName">
+          <el-input v-model="searchForm.templateName" :placeholder="$t('form.placeholderInput')" clearable style="width: 150px" @keyup.enter.native="search" />
+        </el-form-item>
+
+        <el-form-item :label="$t('page.business.form.cjsj')">
+          <el-date-picker v-model="daterange" clearable type="daterange" range-separator="-" :start-placeholder="$t('page.business.form.startDate')"
+            :end-placeholder="$t('page.business.form.endDate')" value-format="yyyy-MM-dd" @change="search" style="width: 220px" />
+        </el-form-item>
+
+        <el-form-item>
+          <el-button type="primary" icon="el-icon-search" @click="search">{{ $t('form.search') }}</el-button>
+          <el-button icon="el-icon-refresh" @click="reset">{{ $t('form.reset') }}</el-button>
+        </el-form-item>
+        
+        <!-- <div>
+          <el-form-item>
+            <el-button type="primary" icon="el-icon-search" @click="search">{{ $t('form.search') }}</el-button>
+            <el-button icon="el-icon-refresh" @click="reset">{{ $t('form.reset') }}</el-button>
+          </el-form-item>
+        </div> -->
+      </el-form>
+    </div>
+    <div class="ytbd-content">
+      <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.form.xzytbd') }}</el-button>
+        </el-col>
+      </el-row>
+
+      <el-table v-loading="loading" :data="list">
+        <el-table-column :label="$t('page.business.form.bh')" prop="sn" />
+        <el-table-column :label="$t('page.business.form.bdmc')" prop="name" />
+        <el-table-column :label="$t('page.business.form.xtmbmc')" prop="templateName" />
+        <el-table-column :label="$t('page.business.form.cjsj')" align="center" prop="createTime" width="140" />
+        <el-table-column :label="$t('page.business.form.cjr')" align="center" prop="leaderName" width="100" />
+
+        <el-table-column :label="$t('page.business.form.status')" prop="status" width="100">
+          <template slot-scope="scope">
+            <span v-if="scope.row.status===1">{{$t('page.business.form.statusTbz')}}</span>
+            <span v-if="scope.row.status===3">{{$t('page.business.form.statusYtj')}}</span>
+            <span v-if="scope.row.status===5">{{$t('page.business.form.statusWtg')}}</span>
+            <span v-if="scope.row.status===10">{{$t('page.business.form.statusYtg')}}</span>
+          </template>
+        </el-table-column>
+
+        
+        <el-table-column :label="$t('form.operate')" fixed="right" align="center" width="200">
+          <template slot-scope="scope">
+            <!-- 详情 -->
+            <el-button type="text" @click="detail(scope.row)" v-hasPermi="['business:study:detail']">{{$t('page.business.form.detail')}}</el-button>
+            <!-- 编辑 -->
+            <el-button type="text" @click="edit(scope.row)" v-hasPermi="['business:study:edit']" v-if="scope.row.status===1">{{$t('page.business.form.edit')}}</el-button>
+            <!-- 审核 -->
+            <el-button type="text" @click="audit(scope.row)" v-hasPermi="['business:study:audit']" v-if="scope.row.status===3 || scope.row.status===5">{{$t('page.business.form.audit')}}</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <pagination
+        v-show="total>0"
+        :total="total"
+        :page.sync="searchForm.pageNum"
+        :limit.sync="searchForm.pageSize"
+        @pagination="getList"
+      />
+    </div>
+  </div>
+</template>
+
+<script>
+import {
+  study_list,
+  study_info,
+  study_save,
+  study_delete
+} from '@/api/business/study/study'
+export default {
+  name: 'YtbdList',
+  props: {
+    study:{
+      type:Object,
+      default:()=>{
+        return {}
+      }
+    }
+  },
+  components: {},
+  computed: {},
+  filters: {},
+  data() {
+    return {
+      daterange:[],
+      searchForm: {
+        pageNum: 1,
+        pageSize: 10,
+        sn:'',
+        name:'',
+        ownerName:'',
+        templateName:'',
+        startDate:'',
+        endDate:'',
+      },
+
+      loading: false,
+      total: 0,
+      list: [],
+    }
+  },
+  created() {},
+  methods: {
+  }
+}
+</script>
+<style lang="scss" scoped>
+.ytbd-list {
+  .ytbd-search{
+    background: #fff;
+    padding: 20px;
+    margin-bottom: 10px;
+    .right-btn{
+      text-align:right
+    }
+  }
+  .ytbd-content{
+    padding: 20px;
+    background: #fff;
+    .add-box{
+      margin-bottom: 10px;
+    }
+  }
+}
+</style>