From e45f27c3ec0e0d64c6670df6f82e75136abebc97 Mon Sep 17 00:00:00 2001
From: "15881625488@163.com" <15881625488@163.com>
Date: Thu, 1 Jan 2026 15:41:08 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E9=80=89=E6=8B=A9=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BF=E6=94=B9=E9=80=A0=EF=BC=8Cui=E8=BF=98=E5=8E=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                                        |  7 +++
 src/lang/en/business/study/studyFormFill.js        | 21 +++----
 src/lang/zh/business/study/studyFormFill.js        | 21 +++----
 .../business/comps/select/SelectTemplateDialog.vue | 65 +++++++++++-----------
 src/views/business/study/comp/tbbd/Xq.vue          |  1 -
 src/views/business/study/comp/tbbdList.vue         | 58 +++++++++++--------
 src/views/business/study/comp/ytbd/Xq.vue          |  1 -
 src/views/business/study/comp/ytbdList.vue         | 30 ++++++----
 8 files changed, 109 insertions(+), 95 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 2f7b353..2bfdb39 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -450,6 +450,13 @@ export default {
     }
   }
 }
+
+/* 单选，隐藏label */
+.hide-label>.el-radio__label {
+  font-size: 0 !important;
+  line-height: 0 !important;
+}
+
 .template-form-item {
     background: #fff;
     padding: 20px;
diff --git a/src/lang/en/business/study/studyFormFill.js b/src/lang/en/business/study/studyFormFill.js
index 5f847d7..dd475a4 100644
--- a/src/lang/en/business/study/studyFormFill.js
+++ b/src/lang/en/business/study/studyFormFill.js
@@ -1,20 +1,19 @@
 export default {
  jcsz:'基础设置',
  bdsj:'表单设计',
+ xzbd:'新增表单',
+ fh:'复核',
+ jq:'加签',
+ ghgsr:'更换归属人',
+ sy:'审阅',
+ fz:'废止',
+ shfz:'确认废止',
+ gc:'观察',
+ bdsm:'表单说明',
  zc:'暂存',
  next:'下一步',
  save:'保存',
  submit:'提交',
- bdsm:'表单说明',
- tjysb:'提交预设表',
- shryId:'审核人员',
- fzrsh:'是否需要试验负责人审核',
- approve:'通过',
- reject:'拒绝',
- reject:'拒绝',
- shtg:'审核通过',
- shjj:'审核拒绝',
- tb:'填报',
  bdnr:'表单内容',
  qmxx:'签名信息',
  qmr:'签名人',
@@ -22,7 +21,5 @@ export default {
  qmsj:'签名时间',
  bzyy:'备注原因',
  jcgj:'稽查轨迹',
- xztbbd:'新增填报表单',
  cjjl:'创建记录',
- ts:'是否确定用该预填模板进行实际填报？',
 }
diff --git a/src/lang/zh/business/study/studyFormFill.js b/src/lang/zh/business/study/studyFormFill.js
index 5cf24fe..dd475a4 100644
--- a/src/lang/zh/business/study/studyFormFill.js
+++ b/src/lang/zh/business/study/studyFormFill.js
@@ -1,20 +1,19 @@
 export default {
  jcsz:'基础设置',
  bdsj:'表单设计',
+ xzbd:'新增表单',
+ fh:'复核',
+ jq:'加签',
+ ghgsr:'更换归属人',
+ sy:'审阅',
+ fz:'废止',
+ shfz:'确认废止',
+ gc:'观察',
+ bdsm:'表单说明',
  zc:'暂存',
  next:'下一步',
  save:'保存',
  submit:'提交',
- bdsm:'表单说明',
- tjysb:'提交预设表',
- shryId:'审核人员',
- fzrsh:'是否需要试验负责人审核',
- approve:'通过',
- reject:'拒绝',
- reject:'拒绝',
- shtg:'审核通过',
- shjj:'审核拒绝',
- tb:'填报',
  bdnr:'表单内容',
  qmxx:'签名信息',
  qmr:'签名人',
@@ -23,6 +22,4 @@ export default {
  bzyy:'备注原因',
  jcgj:'稽查轨迹',
  cjjl:'创建记录',
- xztbbd:'新增填报表单',
- ts:'是否确定用该预填模板进行实际填报？',
 }
diff --git a/src/views/business/comps/select/SelectTemplateDialog.vue b/src/views/business/comps/select/SelectTemplateDialog.vue
index f3218c0..fd42b06 100644
--- a/src/views/business/comps/select/SelectTemplateDialog.vue
+++ b/src/views/business/comps/select/SelectTemplateDialog.vue
@@ -1,51 +1,39 @@
 <template>
   <div class="select-template">
-    <el-dialog :title="$t('page.system.template.selectTemplate')" :visible.sync="open" width="80%" append-to-body :close-on-click-modal="false"
-      style="padding: 20px 20px;">
+    <el-dialog :title="$t('page.system.template.selectTemplate')" :visible.sync="open" width="800px" append-to-body
+      :close-on-click-modal="false" style="padding: 20px 20px;">
       <div class="dialog-container">
         <el-form :model="searchForm" ref="searchForm" :inline="true">
-          <el-form-item :label="$t('page.system.template.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.system.template.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.system.template.department') + '：'" prop="deptId">
             <select-dept style="width:200px" v-model="searchForm.deptId" @change="search" />
           </el-form-item>
-          <el-form-item :label="$t('page.system.template.status') + '：'" prop="status">
-            <el-select v-model="searchForm.status" :placeholder="$t('form.placeholderSelect')" clearable
-              style="width: 100px" @change="search">
-              <el-option key="0" :label="$t('page.system.template.statusEnable')" :value="10" />
-              <el-option key="1" :label="$t('page.system.template.statusDisable')" :value="1" />
-            </el-select>
-          </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>
         </el-form>
-        <el-table v-loading="loading" :data="list">
-          <el-table-column :label="$t('page.system.template.sn')" align="center" prop="sn" />
-          <el-table-column :label="$t('page.system.template.name')" align="center" prop="name" />
-          <el-table-column :label="$t('page.system.template.department')" align="center" prop="deptName" />
-          <el-table-column :label="$t('page.system.template.status')" prop="status" width="150">
+        <el-table v-loading="loading" border :data="list">
+          <!-- 单选列 -->
+          <el-table-column width="80" align="center">
             <template slot-scope="scope">
-              <span v-if="scope.row.status === 10">{{ $t('page.system.template.statusEnable') }}</span>
-              <span v-if="scope.row.status === 1">{{ $t('page.system.template.statusDisable') }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column :label="$t('form.operate')" fixed="right" align="center" width="150">
-            <template slot-scope="scope">
-              <el-button type="primary" v-if="scope.row.status === 10" @click="handleSelect(scope.row)">{{ $t('page.system.template.select') }}</el-button>
+              <el-radio v-model="selectedId" :label="scope.row.id" class="hide-label"  @click.native.stop="handleRadioClick(scope.row)"></el-radio>
             </template>
           </el-table-column>
+          <el-table-column :label="$t('page.system.template.sn')" align="center" prop="sn" width="150px"/>
+          <el-table-column :label="$t('page.system.template.name')" align="center" prop="name" />
+          <el-table-column :label="$t('page.system.template.department')" align="center" prop="deptName" width="150px"/>
         </el-table>
-        <pagination v-show="total > 0" :total="total" :page.sync="searchForm.pageNum"
-          :limit.sync="searchForm.pageSize" @pagination="getList" />
+        <pagination v-show="total > 0" :total="total" :page.sync="searchForm.pageNum" :limit.sync="searchForm.pageSize"
+          @pagination="getList" />
+      </div>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="open = false">{{ $t('form.cancel') }}</el-button>
+        <el-button type="primary" :disabled="!(this.selectedId && this.selectedId !== '')" @click="handleSelect">{{
+          $t('form.saveConfirm') }}</el-button>
       </div>
     </el-dialog>
   </div>
@@ -56,13 +44,14 @@ import { public_templateList } from "@/api/business/public/public";
 import SelectDept from "@/views/business/comps/select/SelectDept";
 export default {
   name: "SelectTemplateDialog",
-  components: {SelectDept},
+  components: { SelectDept },
   props: {
   },
   watch: {
   },
   data() {
     return {
+      selectedId: null,
       loading: false,
       open: false,
       total: 0,
@@ -70,7 +59,7 @@ export default {
       searchForm: {
         pageNum: 1,
         pageSize: 10,
-         sn: '',
+        sn: '',
         name: '',
         deptId: null,
         status: '',
@@ -80,12 +69,16 @@ export default {
   mounted() {
   },
   methods: {
+    handleRadioClick(row) {
+      this.selectedId = row.id
+    },
     show() {
+      this.selectedId=null
       this.search()
     },
     search() {
       this.searchForm.pageNum = 1;
-        this.open = true
+      this.open = true
       this.getList();
     },
     reset() {
@@ -106,8 +99,10 @@ export default {
         this.loading = false
       })
     },
-    handleSelect(row) {
-      this.$emit('callback', row);
+    handleSelect() {
+      let that = this
+      let _index = _.findIndex(this.list, function (item) { return item.id = that.selectedId })
+      this.$emit('callback', this.list[_index]);
       this.open = false
     }
   }
@@ -115,5 +110,7 @@ export default {
 </script>
 
 <style rel="stylesheet/scss" lang="scss">
-.select-template {}
+.select-template {
+ 
+}
 </style>
\ No newline at end of file
diff --git a/src/views/business/study/comp/tbbd/Xq.vue b/src/views/business/study/comp/tbbd/Xq.vue
index 02f267c..bc0b047 100644
--- a/src/views/business/study/comp/tbbd/Xq.vue
+++ b/src/views/business/study/comp/tbbd/Xq.vue
@@ -7,7 +7,6 @@ G<template>
           <div class="left-title"></div>
         </div>
         <div class="center-top">
-          {{ form.bdmc }}
         </div>
         <div class="right-top">
           <el-button @click="cancel()">{{ $t('form.cancel') }}</el-button>
diff --git a/src/views/business/study/comp/tbbdList.vue b/src/views/business/study/comp/tbbdList.vue
index fb21997..6d9ea14 100644
--- a/src/views/business/study/comp/tbbdList.vue
+++ b/src/views/business/study/comp/tbbdList.vue
@@ -12,8 +12,7 @@
               style="width: 150px" @keyup.enter.native="search" />
           </el-form-item>
           <el-form-item :label="$t('page.business.form.gsr')" prop="userId">
-            <el-input v-model="searchForm.userId" :placeholder="$t('form.placeholderInput')" clearable
-              style="width: 150px" @keyup.enter.native="search" />
+            <SelectDeptUser v-model="searchForm.userId" :name="searchForm.userMc" key="userId" @change="userChange" />
           </el-form-item>
           <el-form-item :label="$t('page.business.form.xtmbmc')" prop="templateName">
             <el-input v-model="searchForm.templateMc" :placeholder="$t('form.placeholderInput')" clearable
@@ -36,8 +35,8 @@
       <div class="tbbd-content">
         <el-row class="add-box">
           <el-col>
-            <el-button type="primary" icon="el-icon-plus" @click="add()" v-hasPermi="['business:study:add']">{{
-              $t('page.business.study.studyFormFill.xztbbd') }}</el-button>
+            <el-button type="primary" icon="el-icon-plus" @click="add()" v-hasPermi="['business:studyFormFill:xz']">{{
+              $t('page.business.study.studyFormFill.xzbd') }}</el-button>
           </el-col>
         </el-row>
 
@@ -59,28 +58,32 @@
           <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)">{{
+              <el-button type="text" @click="detail(scope.row)" v-hasPermi="['business:studyFormFill:xq']">{{
                 $t('form.detail') }}</el-button>
               <!-- 编辑 -->
-              <el-button type="text" @click="edit(scope.row)" v-if="scope.row.bdzt === 1">{{
+              <el-button type="text" @click="edit(scope.row)" v-hasPermi="['business:studyFormFill:bj']">{{
                 $t('form.edit') }}</el-button>
-              <template v-if="scope.row.fzrsh == 10">
-                <template v-if="scope.row.fzrshzt == 5">
-                  <!-- 负责人审核 -->
-                  <el-button type="text" @click="audit(scope.row)" v-if="scope.row.bdzt === 3 && id == leader">{{
-                    $t('page.business.form.audit') }}</el-button>
-                </template>
-                <template>
-                  <!-- 有权限审核 -->
-                  <el-button type="text" @click="audit(scope.row)" v-hasPermi="['business:studyFormFill:audit']"
-                    v-if="scope.row.bdzt === 3">{{ $t('page.business.form.audit') }}</el-button>
-                </template>
-              </template>
-              <template v-else>
-                <!-- 有权限审核 -->
-                <el-button type="text" @click="audit(scope.row)" v-hasPermi="['business:studyFormFill:audit']"
-                  v-if="scope.row.bdzt === 3">{{ $t('page.business.form.audit') }}</el-button>
-              </template>
+              <!-- 复核 -->
+              <el-button type="text" @click="edit(scope.row)" v-hasPermi="['business:studyFormFill:fh']">{{
+                $t('page.business.study.studyFormFill.fh') }}</el-button>
+              <!-- 加签 -->
+              <el-button type="text" @click="edit(scope.row)" v-hasPermi="['business:studyFormFill:jq']">{{
+                $t('page.business.study.studyFormFill.jq') }}</el-button>
+              <!-- 更换归属人 -->
+              <el-button type="text" @click="edit(scope.row)" v-hasPermi="['business:studyFormFill:ghgsr']">{{
+                $t('page.business.study.studyFormFill.ghgsr') }}</el-button>
+              <!-- 审阅 -->
+              <el-button type="text" @click="edit(scope.row)" v-hasPermi="['business:studyFormFill:sy']">{{
+                $t('page.business.study.studyFormFill.sy') }}</el-button>
+              <!-- 废止 -->
+              <el-button type="text" @click="edit(scope.row)" v-hasPermi="['business:studyFormFill:fz']">{{
+                $t('page.business.study.studyFormFill.fz') }}</el-button>
+              <!-- 确认废止 -->
+              <el-button type="text" @click="edit(scope.row)" v-hasPermi="['business:studyFormFill:shfz']">{{
+                $t('page.business.study.studyFormFill.shfz') }}</el-button>
+              <!-- 观察 -->
+              <el-button type="text" @click="edit(scope.row)" v-hasPermi="['business:studyFormFill:gc']">{{
+                $t('page.business.study.studyFormFill.gc') }}</el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -106,6 +109,7 @@ import {
 import Bj from "./tbbd/Bj";
 import Xq from "./tbbd/Xq";
 import Sh from "./tbbd/Sh";
+import SelectDeptUser from '@/views/business/comps/select/SelectDeptUser';
 import { mapGetters } from 'vuex'
 export default {
   name: 'YtbdList',
@@ -133,7 +137,7 @@ export default {
       deep: true
     }
   },
-  components: { Bj, Xq, Sh },
+  components: { Bj, Xq, Sh, SelectDeptUser },
   data() {
     return {
       leader: null,
@@ -148,6 +152,7 @@ export default {
         bdbh: '',
         bdmc: '',
         userId: '',
+        userMc: '',
         templateMc: '',
         startDate: '',
         endDate: '',
@@ -160,6 +165,11 @@ export default {
   },
   created() { },
   methods: {
+    userChange(val) {
+      this.searchForm.userId = val.id
+      this.searchForm.userMc = val.name
+      this.search()
+    },
     search() {
       this.searchForm.pageNum = 1
       this.getList()
diff --git a/src/views/business/study/comp/ytbd/Xq.vue b/src/views/business/study/comp/ytbd/Xq.vue
index be28d3d..373e618 100644
--- a/src/views/business/study/comp/ytbd/Xq.vue
+++ b/src/views/business/study/comp/ytbd/Xq.vue
@@ -7,7 +7,6 @@ G<template>
           <div class="left-title"></div>
         </div>
         <div class="center-top">
-          {{ form.bdmc }}
         </div>
         <div class="right-top">
           <el-button @click="cancel()">{{ $t('form.cancel') }}</el-button>
diff --git a/src/views/business/study/comp/ytbdList.vue b/src/views/business/study/comp/ytbdList.vue
index 7140777..1dadb2b 100644
--- a/src/views/business/study/comp/ytbdList.vue
+++ b/src/views/business/study/comp/ytbdList.vue
@@ -12,8 +12,7 @@
               style="width: 150px" @keyup.enter.native="search" />
           </el-form-item>
           <el-form-item :label="$t('page.business.form.gsr')" prop="userId">
-            <el-input v-model="searchForm.userId" :placeholder="$t('form.placeholderInput')" clearable
-              style="width: 150px" @keyup.enter.native="search" />
+            <SelectDeptUser v-model="searchForm.userId" :name="searchForm.userMc" key="userId" @change="userChange" />
           </el-form-item>
           <el-form-item :label="$t('page.business.form.xtmbmc')" prop="templateName">
             <el-input v-model="searchForm.templateMc" :placeholder="$t('form.placeholderInput')" clearable
@@ -36,7 +35,7 @@
       <div class="ytbd-content">
         <el-row class="add-box">
           <el-col>
-            <el-button type="primary" icon="el-icon-plus" @click="add()" v-hasPermi="['business:study:add']">{{
+            <el-button type="primary" icon="el-icon-plus" @click="add()" v-hasPermi="['business:studyFormPre:xz']">{{
               $t('page.business.form.xzytbd') }}</el-button>
           </el-col>
         </el-row>
@@ -60,26 +59,28 @@
           <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)">{{
+              <el-button type="text" v-hasPermi="['business:studyFormPre:xq']" @click="detail(scope.row)">{{
                 $t('form.detail') }}</el-button>
               <!-- 编辑 -->
-              <el-button type="text" @click="edit(scope.row)" v-if="scope.row.bdzt === 1">{{
-                $t('form.edit') }}</el-button>
+              <el-button type="text" v-hasPermi="['business:studyFormPre:bj']" @click="edit(scope.row)"
+                v-if="scope.row.bdzt === 1">{{
+                  $t('form.edit') }}</el-button>
               <template v-if="scope.row.fzrsh == 10">
                 <template v-if="scope.row.fzrshzt == 5">
                   <!-- 负责人审核 -->
-                  <el-button type="text" @click="audit(scope.row)" v-if="scope.row.bdzt === 3 && id == leader">{{
-                    $t('page.business.form.audit') }}</el-button>
+                  <el-button type="text" @click="audit(scope.row)" v-hasPermi="['business:studyFormPre:sh']"
+                    v-if="scope.row.bdzt === 3 && id == leader">{{
+                      $t('page.business.form.audit') }}</el-button>
                 </template>
                 <template>
                   <!-- 有权限审核 -->
-                  <el-button type="text" @click="audit(scope.row)" v-hasPermi="['business:studyFormPre:audit']"
+                  <el-button type="text" @click="audit(scope.row)" v-hasPermi="['business:studyFormPre:sh']"
                     v-if="scope.row.bdzt === 3">{{ $t('page.business.form.audit') }}</el-button>
                 </template>
               </template>
               <template v-else>
                 <!-- 有权限审核 -->
-                <el-button type="text" @click="audit(scope.row)" v-hasPermi="['business:studyFormPre:audit']"
+                <el-button type="text" @click="audit(scope.row)" v-hasPermi="['business:studyFormPre:sh']"
                   v-if="scope.row.bdzt === 3">{{ $t('page.business.form.audit') }}</el-button>
               </template>
             </template>
@@ -107,6 +108,7 @@ import {
 import Bj from "./ytbd/Bj";
 import Xq from "./ytbd/Xq";
 import Sh from "./ytbd/Sh";
+import SelectDeptUser from '@/views/business/comps/select/SelectDeptUser';
 import { mapGetters } from 'vuex'
 export default {
   name: 'YtbdList',
@@ -134,7 +136,7 @@ export default {
       deep: true
     }
   },
-  components: { Bj, Xq, Sh },
+  components: { Bj, Xq, Sh, SelectDeptUser },
   data() {
     return {
       leader: null,
@@ -149,6 +151,7 @@ export default {
         bdbh: '',
         bdmc: '',
         userId: '',
+        userMc: '',
         templateMc: '',
         startDate: '',
         endDate: '',
@@ -161,6 +164,11 @@ export default {
   },
   created() { },
   methods: {
+    userChange(val) {
+      this.searchForm.userId = val.id
+      this.searchForm.userMc = val.name
+      this.search()
+    },
     search() {
       this.searchForm.pageNum = 1
       this.getList()