From 8d0a4898db8b2f52759e8a9354a44562fef034e8 Mon Sep 17 00:00:00 2001
From: "15881625488@163.com" <15881625488@163.com>
Date: Wed, 31 Dec 2025 23:07:32 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A[=E8=AF=95=E9=AA=8C=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86][=E9=A2=84=E5=A1=AB=E8=A1=A8=E5=8D=95=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/lang/en/business/study/studyFormPre.js | 28 ++++++++++++++-
 src/lang/zh/business/study/studyFormPre.js | 28 ++++++++++++++-
 src/views/business/study/comp/ytbd/Bj.vue  | 56 ++++++++++++++++++------------
 src/views/business/study/comp/ytbd/Sh.vue  |  8 ++---
 src/views/business/study/comp/ytbd/Xq.vue  | 20 +++++------
 src/views/business/study/comp/ytbdList.vue |  7 ----
 6 files changed, 101 insertions(+), 46 deletions(-)

diff --git a/src/lang/en/business/study/studyFormPre.js b/src/lang/en/business/study/studyFormPre.js
index 5ea6092..7313be3 100644
--- a/src/lang/en/business/study/studyFormPre.js
+++ b/src/lang/en/business/study/studyFormPre.js
@@ -1,3 +1,29 @@
 export default {
-  
+ jcsz:'基础设置',
+ bdsj:'表单设计',
+ zc:'暂存',
+ next:'下一步',
+ save:'保存',
+ submit:'提交',
+ bdsm:'表单说明',
+ tjysb:'提交预设表',
+ shryId:'审核人员',
+ fzrsh:'是否需要试验负责人审核',
+ approve:'通过',
+ reject:'拒绝',
+ reject:'拒绝',
+ shtg:'审核通过',
+ shjj:'审核拒绝',
+ tb:'填报',
+ bdnr:'表单内容',
+ qmxx:'签名信息',
+ qmr:'签名人',
+ qmyy:'签名意义',
+ qmsj:'签名时间',
+ bzyy:'备注原因',
+ jcgj:'稽查轨迹',
+ cjjl:'创建记录',
+ ts:'是否确定用该预填模板进行实际填报？',
+ ts:'是否确定用该预填模板进行实际填报？',
+ ts:'是否确定用该预填模板进行实际填报？',
 }
diff --git a/src/lang/zh/business/study/studyFormPre.js b/src/lang/zh/business/study/studyFormPre.js
index 530b080..7313be3 100644
--- a/src/lang/zh/business/study/studyFormPre.js
+++ b/src/lang/zh/business/study/studyFormPre.js
@@ -1,3 +1,29 @@
 export default {
- 
+ jcsz:'基础设置',
+ bdsj:'表单设计',
+ zc:'暂存',
+ next:'下一步',
+ save:'保存',
+ submit:'提交',
+ bdsm:'表单说明',
+ tjysb:'提交预设表',
+ shryId:'审核人员',
+ fzrsh:'是否需要试验负责人审核',
+ approve:'通过',
+ reject:'拒绝',
+ reject:'拒绝',
+ shtg:'审核通过',
+ shjj:'审核拒绝',
+ tb:'填报',
+ bdnr:'表单内容',
+ qmxx:'签名信息',
+ qmr:'签名人',
+ qmyy:'签名意义',
+ qmsj:'签名时间',
+ bzyy:'备注原因',
+ jcgj:'稽查轨迹',
+ cjjl:'创建记录',
+ ts:'是否确定用该预填模板进行实际填报？',
+ ts:'是否确定用该预填模板进行实际填报？',
+ ts:'是否确定用该预填模板进行实际填报？',
 }
diff --git a/src/views/business/study/comp/ytbd/Bj.vue b/src/views/business/study/comp/ytbd/Bj.vue
index e6d42e5..b3e8d38 100644
--- a/src/views/business/study/comp/ytbd/Bj.vue
+++ b/src/views/business/study/comp/ytbd/Bj.vue
@@ -11,31 +11,32 @@ G<template>
             <div :class="showIndex == 1 ? 'el-step__icon is-text is-finish' : 'el-step__icon is-text is-info'">
               <div class="el-step__icon-inner">1</div>
             </div>
-            基础设置
+            {{ $t('page.business.study.studyFormPre.jcsz') }}
           </div>
           <div class="line"></div>
           <div>
             <div :class="showIndex == 2 ? 'el-step__icon is-text is-finish' : 'el-step__icon is-text is-info'">
               <div class="el-step__icon-inner">2</div>
             </div>
-            表单设计
+            {{ $t('page.business.study.studyFormPre.bdsj') }}
           </div>
         </div>
         <div class="right-top">
           <el-button @click="cancel()">{{ $t('form.cancel') }}</el-button>
           <template v-if="showIndex == 1">
-            <el-button @click="save">暂存</el-button>
-            <el-button type="primary" @click="next">下一步</el-button>
+            <el-button @click="save">{{ $t('page.business.study.studyFormPre.zc') }}</el-button>
+            <el-button type="primary" @click="next">{{ $t('page.business.study.studyFormPre.next') }}</el-button>
           </template>
           <template v-else>
-            <el-button @click="saveNext">保存</el-button>
-            <el-button type="primary" @click="openSubmit = true">提交</el-button>
+            <el-button @click="saveNext">{{ $t('page.business.study.studyFormPre.save') }}</el-button>
+            <el-button type="primary" @click="openSubmit = true">{{ $t('page.business.study.studyFormPre.submit')
+            }}</el-button>
           </template>
         </div>
       </div>
       <div class="edit-content">
-        <div class="content" style="width:60%">
-          <el-form ref="form" :model="form" :rules="rules" label-width="120px" v-if="showIndex == 1">
+        <div class="content" style="width:60%" v-show="showIndex == 1">
+          <el-form ref="form" :model="form" :rules="rules" label-width="120px">
             <el-row>
               <el-col :span="24">
                 <el-form-item :label="$t('page.business.form.xtmbmc')" prop="templateId">
@@ -52,7 +53,7 @@ G<template>
             </el-row>
             <el-row>
               <el-col :span="24">
-                <el-form-item label="表单说明" prop="bdsm">
+                <el-form-item :label="$t('page.business.study.studyFormPre.bdsm')" prop="bdsm">
                   <el-input type="textarea" v-model="form.bdsm" :rows="5" maxlength="500"
                     :placeholder="$t('form.placeholderInput')">
                   </el-input>
@@ -60,25 +61,26 @@ G<template>
               </el-col>
             </el-row>
           </el-form>
-          <div v-else>
-            表单详情todo
-          </div>
+        </div>
+        <div class="content" v-show="showIndex == 2">
+          <TemplateTable ref="templateTable" sn="SP001" fillType="preFill" />
         </div>
       </div>
     </div>
 
-    <el-dialog title="提交预设表" :visible.sync="openSubmit" width="500px" append-to-body :close-on-click-modal="false">
+    <el-dialog :title="$t('page.business.study.studyFormPre.tjysb')" :visible.sync="openSubmit" width="500px"
+      append-to-body :close-on-click-modal="false">
       <el-form ref="formSubmit" :model="form" :rules="rulesApprove" label-width="120px">
         <el-row>
           <el-col :span="24">
-            <el-form-item label="审核人员" prop="shryId">
+            <el-form-item :label="$t('page.business.study.studyFormPre.shryId')" prop="shryId">
               <SelectDeptUser v-model="form.shryId" :name="form.shryMc" key="shryId" @change="selectDeptUserChange" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="24">
-            <el-form-item label="是否需要试验负责人审核" prop="fzrsh">
+            <el-form-item :label="$t('page.business.study.studyFormPre.shryId')" prop="fzrsh">
               <el-radio-group v-model="form.fzrsh">
                 <el-radio :label="10">是</el-radio>
                 <el-radio :label="1">否</el-radio>
@@ -133,10 +135,11 @@ import { studyFormPre_bc, studyFormPre_tj, studyFormPre_info } from "@/api/busin
 import { mapGetters } from 'vuex'
 import SelectTemplate from "@/views/business/comps/select/SelectTemplate";
 import SelectDeptUser from '@/views/business/comps/select/SelectDeptUser';
+import TemplateTable from '@/views/business/comps/template/TemplateTable';
 
 export default {
   name: "Bj",
-  components: { SelectTemplate, SelectDeptUser },
+  components: { SelectTemplate, SelectDeptUser, TemplateTable },
   data() {
     return {
       open: false,
@@ -243,7 +246,9 @@ export default {
         }
       })
     },
-    saveNext() {
+    async saveNext() {
+      let content = await this.$refs.templateTable.getFormData()
+      this.form.bdnr=JSON.stringify(content)
       this.$modal.loading()
       studyFormPre_bc(this.form).then(response => {
         this.$emit('close')
@@ -253,14 +258,19 @@ export default {
     tj() {
       this.$refs["formSubmit"].validate(valid => {
         if (valid) {
-          this.$modal.loading()
-          studyFormPre_tj(this.form).then(response => {
-            this.$emit('close')
-            this.openSubmit = false
-            this.$modal.closeLoading()
-          })
+          this.dotj()
         }
       })
+    },
+    async dotj() {
+      let content = await this.$refs.templateTable.getFormData()
+      this.form.bdnr=JSON.stringify(content)
+      this.$modal.loading()
+      studyFormPre_tj(this.form).then(response => {
+        this.$emit('close')
+        this.openSubmit = false
+        this.$modal.closeLoading()
+      })
     }
   }
 }
diff --git a/src/views/business/study/comp/ytbd/Sh.vue b/src/views/business/study/comp/ytbd/Sh.vue
index 0cc7c88..0fdfd67 100644
--- a/src/views/business/study/comp/ytbd/Sh.vue
+++ b/src/views/business/study/comp/ytbd/Sh.vue
@@ -11,8 +11,8 @@ G<template>
         </div>
         <div class="right-top">
           <el-button @click="cancel()">{{ $t('form.cancel') }}</el-button>
-          <el-button type="danger" @click="showReject">拒绝</el-button>
-          <el-button type="primary" @click="showApprove">通过</el-button>
+          <el-button type="danger" @click="showReject">{{ $t('page.business.study.studyFormPre.reject') }}</el-button>
+          <el-button type="primary" @click="showApprove">{{ $t('page.business.study.studyFormPre.approve') }}</el-button>
         </div>
       </div>
       <div class="edit-content ">
@@ -20,7 +20,7 @@ G<template>
       </div>
     </div>
     <!-- 通过 -->
-    <el-dialog title="审核通过" :visible.sync="openApprove" width="500px" append-to-body :close-on-click-modal="false">
+    <el-dialog :title="$t('page.business.study.studyFormPre.shtg')" :visible.sync="openApprove" width="500px" append-to-body :close-on-click-modal="false">
       <el-form ref="formApprove" :model="formApprove" :rules="rulesApprove" label-width="120px">
         <el-row>
           <el-col :span="24">
@@ -63,7 +63,7 @@ G<template>
     </el-dialog>
 
     <!-- 拒绝 -->
-    <el-dialog title="审核拒绝" :visible.sync="openReject" width="500px" append-to-body :close-on-click-modal="false">
+    <el-dialog :title="$t('page.business.study.studyFormPre.shjj')" :visible.sync="openReject" width="500px" append-to-body :close-on-click-modal="false">
       <el-form ref="formReject" :model="formReject" :rules="rulesReject" label-width="120px">
         <el-row>
           <el-col :span="24">
diff --git a/src/views/business/study/comp/ytbd/Xq.vue b/src/views/business/study/comp/ytbd/Xq.vue
index e4dddd2..be28d3d 100644
--- a/src/views/business/study/comp/ytbd/Xq.vue
+++ b/src/views/business/study/comp/ytbd/Xq.vue
@@ -11,26 +11,26 @@ G<template>
         </div>
         <div class="right-top">
           <el-button @click="cancel()">{{ $t('form.cancel') }}</el-button>
-          <el-button type="primary" v-if="form.bdzt === 5&&form.tbzt === 1" @click="openApprove = true">填报</el-button>
+          <el-button type="primary" v-if="form.bdzt === 5&&form.tbzt === 1" @click="openApprove = true">{{ $t('page.business.study.studyFormPre.tb') }}</el-button>
         </div>
       </div>
       <div class="edit-content ">
         <div class="content-left">
           <div class="content-title">
             <div class="line"></div>
-            <div class="subtitle"> 表单内容</div>
+            <div class="subtitle"> {{  $t('page.business.study.studyFormPre.bdnr') }}</div>
           </div>
           todo
           <div class="content-title">
             <div class="line"></div>
-            <div class="subtitle"> 签名信息</div>
+            <div class="subtitle"> {{  $t('page.business.study.studyFormPre.qmxx') }}</div>
           </div>
           <div class="pal">
             <el-table :data="qmxxList" v-loading="loadingQmxx">
-              <el-table-column label="签名人" align="center" prop="qmrMc" width="150px" />
-              <el-table-column label="签名意义" align="center" prop="qmyy" width="150px" />
-              <el-table-column label="签名时间" align="center" prop="createTime" width="150px" />
-              <el-table-column label="备注原因" align="center" prop="remark" :show-overflow-tooltip="true" />
+              <el-table-column :label="$t('page.business.study.studyFormPre.qmr')" align="center" prop="qmrMc" width="150px" />
+              <el-table-column :label="$t('page.business.study.studyFormPre.qmyy')" align="center" prop="qmyy" width="150px" />
+              <el-table-column :label="$t('page.business.study.studyFormPre.qmsj')" align="center" prop="createTime" width="150px" />
+              <el-table-column :label="$t('page.business.study.studyFormPre.bzyy')" align="center" prop="remark" :show-overflow-tooltip="true" />
             </el-table>
           </div>
           <div class="pal">
@@ -41,7 +41,7 @@ G<template>
         <div class="content-right">
           <div class="content-title">
             <div class="line"></div>
-            <div class="subtitle"> 稽查轨迹</div>
+            <div class="subtitle"> {{  $t('page.business.study.studyFormPre.jcgj') }}</div>
           </div>
           <jcgjList ref="jcgjList" @handleQuery="getJjcgjList" />
 
@@ -52,9 +52,9 @@ G<template>
     </div>
 
     <!-- 填报 -->
-    <el-dialog title="创建记录" :visible.sync="openApprove" width="500px" append-to-body :close-on-click-modal="false">
+    <el-dialog :title="$t('page.business.study.studyFormPre.cjjl')" :visible.sync="openApprove" width="500px" append-to-body :close-on-click-modal="false">
       <el-form ref="formApprove" :model="formApprove" :rules="rulesApprove" label-width="120px">
-        <el-alert title="是否确定用该预填模板进行实际填报？" :closable="false" type="success">
+        <el-alert :title="$t('page.business.study.studyFormPre.ts')" :closable="false" type="success">
         </el-alert>
         <el-row>
           <el-col :span="24">
diff --git a/src/views/business/study/comp/ytbdList.vue b/src/views/business/study/comp/ytbdList.vue
index 17b6732..7140777 100644
--- a/src/views/business/study/comp/ytbdList.vue
+++ b/src/views/business/study/comp/ytbdList.vue
@@ -31,13 +31,6 @@
             <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">