From 44edebcf52ab2c2f5b5a831e744245389fc1415f Mon Sep 17 00:00:00 2001
From: memorylkf <312904636@qq.com>
Date: Wed, 14 Jan 2026 15:27:09 +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=94=81=E5=AE=9A=E5=A2=9E=E5=8A=A0=E8=A1=A8=E5=8D=95?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD=20feat:=20[=E7=A8=BD=E6=9F=A5=E8=BD=A8?=
 =?UTF-8?q?=E8=BF=B9]=20=E7=94=A8=E6=88=B7=E5=90=8D=E7=94=A8=E4=B8=AD?=
 =?UTF-8?q?=E6=96=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/business/comps/common/JcgjList.vue                |  3 ++-
 src/views/business/comps/select/SelectDeptUser.vue          |  5 +++--
 src/views/business/comps/select/SelectDeptUserDialog.vue    | 12 ++++++++----
 .../business/comps/select/SelectDeptUserMultipleDialog.vue  | 13 ++++++++-----
 src/views/business/form/drug/comp/sign.vue                  | 10 ++++++++--
 src/views/business/form/drug/comp/ytbdList.vue              |  6 +++++-
 src/views/business/form/drug/list.vue                       |  3 ++-
 src/views/business/form/nonTrial/comp/sign.vue              | 10 ++++++++--
 src/views/business/form/nonTrial/comp/ytbdList.vue          |  6 +++++-
 src/views/business/form/nonTrial/list.vue                   |  3 ++-
 src/views/business/study/comp/sign.vue                      | 10 ++++++++--
 src/views/business/study/comp/syxx.vue                      |  2 +-
 src/views/business/study/list.vue                           |  3 ++-
 13 files changed, 62 insertions(+), 24 deletions(-)

diff --git a/src/views/business/comps/common/JcgjList.vue b/src/views/business/comps/common/JcgjList.vue
index 1549a28..c2ae879 100644
--- a/src/views/business/comps/common/JcgjList.vue
+++ b/src/views/business/comps/common/JcgjList.vue
@@ -39,7 +39,8 @@
             {{$t('form.qmyy')}}：{{ $i18n.locale === 'zh_CN'?item.jcmc:item.jcmcEn  }}
           </div>
           <div v-if="item.qmrId&&item.qmrId>0">
-            {{$t('form.signer')}}：{{ $i18n.locale === 'zh_CN'?item.qmrMc:item.qmrMcEn  }}
+            <!-- {{$t('form.signer')}}：{{ $i18n.locale === 'zh_CN'?item.qmrMc:item.qmrMcEn  }} -->
+            {{$t('form.signer')}}：{{ item.qmrMc  }}
           </div>
         </div>
       </el-timeline-item>
diff --git a/src/views/business/comps/select/SelectDeptUser.vue b/src/views/business/comps/select/SelectDeptUser.vue
index e13e8d6..269fcfe 100644
--- a/src/views/business/comps/select/SelectDeptUser.vue
+++ b/src/views/business/comps/select/SelectDeptUser.vue
@@ -2,8 +2,9 @@
 
 <template>
   <div>
-    <el-input v-if="$i18n.locale === 'zh_CN'" v-model="selected.name" :placeholder="$t('form.placeholderSelect')" readonly @click.native="showSelectDeptUser" />
-    <el-input v-else v-model="selected.nameEn" :placeholder="$t('form.placeholderSelect')" readonly @click.native="showSelectDeptUser" />
+    <el-input v-model="selected.name" :placeholder="$t('form.placeholderSelect')" readonly @click.native="showSelectDeptUser" />
+    <!-- <el-input v-if="$i18n.locale === 'zh_CN'" v-model="selected.name" :placeholder="$t('form.placeholderSelect')" readonly @click.native="showSelectDeptUser" />
+    <el-input v-else v-model="selected.nameEn" :placeholder="$t('form.placeholderSelect')" readonly @click.native="showSelectDeptUser" /> -->
     <SelectDeptUserDialog ref="selectDeptUserDialog" @change="handleChange" />
   </div>
 </template>
diff --git a/src/views/business/comps/select/SelectDeptUserDialog.vue b/src/views/business/comps/select/SelectDeptUserDialog.vue
index 57c5cc9..0dcca26 100644
--- a/src/views/business/comps/select/SelectDeptUserDialog.vue
+++ b/src/views/business/comps/select/SelectDeptUserDialog.vue
@@ -21,8 +21,10 @@
           node-key="id"
           >
           <span class="custom-tree-node" slot-scope="{ node, data }">
-            <el-radio :ref="'radio'+data.id" v-if="data.type===7" v-model="selected.id" :label="data.id" @change="handleChange(data)" class="select-dept-user-check-radio-box">{{ $i18n.locale === 'zh_CN'?data.name:data.nameEn }}</el-radio>
-            <span v-else>{{ $i18n.locale === 'zh_CN'?data.name:data.nameEn }}</span>
+            <!-- <el-radio :ref="'radio'+data.id" v-if="data.type===7" v-model="selected.id" :label="data.id" @change="handleChange(data)" class="select-dept-user-check-radio-box">{{ $i18n.locale === 'zh_CN'?data.name:data.nameEn }}</el-radio> -->
+            <el-radio :ref="'radio'+data.id" v-if="data.type===7" v-model="selected.id" :label="data.id" @change="handleChange(data)" class="select-dept-user-check-radio-box">{{data.name }}</el-radio>
+            <!-- <span v-else>{{ $i18n.locale === 'zh_CN'?data.name:data.nameEn }}</span> -->
+            <span v-else>{{ data.name }}</span>
           </span>
         </el-tree>
       </el-col>
@@ -30,7 +32,8 @@
         <div>已选</div>
         <div class="select-user-selected" v-if="selected.id!=''">
           <div class="select-user-selected-item">
-            <div class="select-user-selected-name">{{$i18n.locale === 'zh_CN'?selected.name:selected.nameEn}}</div>
+            <!-- <div class="select-user-selected-name">{{$i18n.locale === 'zh_CN'?selected.name:selected.nameEn}}</div> -->
+            <div class="select-user-selected-name">{{selected.name}}</div>
             <div class="select-user-selected-del"><i class="el-icon-delete" @click="delSelected"></i></div>
           </div>
         </div>
@@ -90,7 +93,8 @@ export default {
     },
     filterNode(value, data) {
       if (!value) return true;
-      return this.$i18n.locale === 'zh_CN'?(data.name.indexOf(value) !== -1):(data.nameEn.indexOf(value) !== -1);
+      // return this.$i18n.locale === 'zh_CN'?(data.name.indexOf(value) !== -1):(data.nameEn.indexOf(value) !== -1);
+      return data.name.indexOf(value) !== -1;
     },
     getList() {
       this.listData = []
diff --git a/src/views/business/comps/select/SelectDeptUserMultipleDialog.vue b/src/views/business/comps/select/SelectDeptUserMultipleDialog.vue
index 7ee111f..d081152 100644
--- a/src/views/business/comps/select/SelectDeptUserMultipleDialog.vue
+++ b/src/views/business/comps/select/SelectDeptUserMultipleDialog.vue
@@ -21,9 +21,10 @@
           node-key="id"
           >
           <span class="custom-tree-node" slot-scope="{ node, data }">
-            <el-checkbox :ref="'checkbox'+data.id" v-if="data.type===7" :checked="isCheck(data.id)" @change="handleChange(data)" class="select-dept-user-check-radio-box">{{ $i18n.locale === 'zh_CN'?data.name:data.nameEn }}</el-checkbox>
-            <!-- <el-radio :ref="'radio'+data.id" v-if="data.type===7" v-model="selected.id" :label="data.id">{{ data.name }}</el-radio> -->
-            <span v-else>{{ $i18n.locale === 'zh_CN'?data.name:data.nameEn }}</span>
+            <!-- <el-checkbox :ref="'checkbox'+data.id" v-if="data.type===7" :checked="isCheck(data.id)" @change="handleChange(data)" class="select-dept-user-check-radio-box">{{ $i18n.locale === 'zh_CN'?data.name:data.nameEn }}</el-checkbox> -->
+            <el-checkbox :ref="'checkbox'+data.id" v-if="data.type===7" :checked="isCheck(data.id)" @change="handleChange(data)" class="select-dept-user-check-radio-box">{{ data.name }}</el-checkbox>
+            <!-- <span v-else>{{ $i18n.locale === 'zh_CN'?data.name:data.nameEn }}</span> -->
+            <span v-else>{{ data.name }}</span>
           </span>
         </el-tree>
       </el-col>
@@ -31,7 +32,8 @@
         <div>已选</div>
         <div class="select-user-selected" v-if="selected.length>0">
           <div class="select-user-selected-item" v-for="(item,index) in selected" :key="index">
-            <div class="select-user-selected-name">{{$i18n.locale === 'zh_CN'?item.name:item.nameEn}}</div>
+            <!-- <div class="select-user-selected-name">{{$i18n.locale === 'zh_CN'?item.name:item.nameEn}}</div> -->
+            <div class="select-user-selected-name">{{item.name}}</div>
             <div class="select-user-selected-del"><i class="el-icon-delete" @click="delSelected(item)"></i></div>
           </div>
         </div>
@@ -99,7 +101,8 @@ export default {
     },
     filterNode(value, data) {
       if (!value) return true;
-      return $i18n.locale === 'zh_CN'?(data.name.indexOf(value) !== -1):(data.nameEn.indexOf(value) !== -1);
+      // return $i18n.locale === 'zh_CN'?(data.name.indexOf(value) !== -1):(data.nameEn.indexOf(value) !== -1);
+      return data.name.indexOf(value) !== -1;
     },
     getList() {
       this.listData = []
diff --git a/src/views/business/form/drug/comp/sign.vue b/src/views/business/form/drug/comp/sign.vue
index 95cacc5..338bc25 100644
--- a/src/views/business/form/drug/comp/sign.vue
+++ b/src/views/business/form/drug/comp/sign.vue
@@ -24,7 +24,13 @@
               </el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="24" v-if="$i18n.locale === 'zh_CN'">
+          <el-col :span="24">
+            <el-form-item :label="$t('form.signer')">
+              <el-input type="text" v-model="form.qmrMc" maxlength="50" disabled
+                :placeholder="$t('form.placeholderInput')" />
+            </el-form-item>
+          </el-col>
+          <!-- <el-col :span="24" v-if="$i18n.locale === 'zh_CN'">
             <el-form-item :label="$t('form.signer')">
               <el-input type="text" v-model="form.qmrMc" maxlength="50" disabled
                 :placeholder="$t('form.placeholderInput')" />
@@ -35,7 +41,7 @@
               <el-input type="text" v-model="form.qmrMcEn" maxlength="50" disabled
                 :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
-          </el-col>
+          </el-col> -->
           <el-col :span="24">
             <el-form-item :label="$t('form.password')" prop="qmrmm">
               <el-input type="password" v-model="form.qmrmm" maxlength="20" :placeholder="$t('form.placeholderInput')" autocomplete="off" auto-complete="new-password" />
diff --git a/src/views/business/form/drug/comp/ytbdList.vue b/src/views/business/form/drug/comp/ytbdList.vue
index 8f6e3b0..7034bd7 100644
--- a/src/views/business/form/drug/comp/ytbdList.vue
+++ b/src/views/business/form/drug/comp/ytbdList.vue
@@ -54,7 +54,7 @@
               v-hasPermi="['business:drugFormPre:xz']">{{
                 $t('page.business.study.studyFormPre.xzbd') }}</el-button>
 
-            <el-button type="primary" @click="sdsy" v-hasPermi="['business:form:drug:sd']" v-if="(leader==id || checkRole(['bz'])) && studyStatus!=5">{{ $t('page.business.study.drug.sdsy') }}</el-button>
+            <el-button type="primary" @click="sdsy" v-hasPermi="['business:form:drug:sd']" v-if="(leader==id || checkRole(['bz'])) && studyStatus!=5 && formCount===formFinishCount">{{ $t('page.business.study.drug.sdsy') }}</el-button>
           </el-col>
         </el-row>
 
@@ -207,6 +207,8 @@ export default {
         this.searchForm.studyId = newVal.id
         this.leader = newVal.leader
         this.studyStatus = newVal.status
+        this.formCount = newVal.formCount
+        this.formFinishCount = newVal.formFinishCount
         this.search()
       },
       immediate: true,
@@ -216,6 +218,8 @@ export default {
   components: { Bj, Xq, Sh, SelectDeptUser, TemplateTable,Sign },
   data() {
     return {
+      formCount:0,
+      formFinishCount:0,
       formPreview: {
         templateSn: null
       },
diff --git a/src/views/business/form/drug/list.vue b/src/views/business/form/drug/list.vue
index 7cd84ad..c95cd12 100644
--- a/src/views/business/form/drug/list.vue
+++ b/src/views/business/form/drug/list.vue
@@ -74,7 +74,8 @@
 
           <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="$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" />
           
diff --git a/src/views/business/form/nonTrial/comp/sign.vue b/src/views/business/form/nonTrial/comp/sign.vue
index 46c0473..13a40e8 100644
--- a/src/views/business/form/nonTrial/comp/sign.vue
+++ b/src/views/business/form/nonTrial/comp/sign.vue
@@ -24,7 +24,13 @@
               </el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="24" v-if="$i18n.locale === 'zh_CN'">
+          <el-col :span="24">
+            <el-form-item :label="$t('form.signer')">
+              <el-input type="text" v-model="form.qmrMc" maxlength="50" disabled
+                :placeholder="$t('form.placeholderInput')" />
+            </el-form-item>
+          </el-col>
+          <!-- <el-col :span="24" v-if="$i18n.locale === 'zh_CN'">
             <el-form-item :label="$t('form.signer')">
               <el-input type="text" v-model="form.qmrMc" maxlength="50" disabled
                 :placeholder="$t('form.placeholderInput')" />
@@ -35,7 +41,7 @@
               <el-input type="text" v-model="form.qmrMcEn" maxlength="50" disabled
                 :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
-          </el-col>
+          </el-col> -->
           <el-col :span="24">
             <el-form-item :label="$t('form.password')" prop="qmrmm">
               <el-input type="password" v-model="form.qmrmm" maxlength="20" :placeholder="$t('form.placeholderInput')" autocomplete="off" auto-complete="new-password" />
diff --git a/src/views/business/form/nonTrial/comp/ytbdList.vue b/src/views/business/form/nonTrial/comp/ytbdList.vue
index 2601378..1fd5d01 100644
--- a/src/views/business/form/nonTrial/comp/ytbdList.vue
+++ b/src/views/business/form/nonTrial/comp/ytbdList.vue
@@ -54,7 +54,7 @@
               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">{{ $t('page.business.study.nonTrial.sdsy') }}</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>
           </el-col>
         </el-row>
 
@@ -207,6 +207,8 @@ export default {
         this.searchForm.studyId = newVal.id
         this.leader = newVal.leader
         this.studyStatus = newVal.status
+        this.formCount = newVal.formCount
+        this.formFinishCount = newVal.formFinishCount
         this.search()
       },
       immediate: true,
@@ -216,6 +218,8 @@ export default {
   components: { Bj, Xq, Sh, SelectDeptUser, TemplateTable,Sign },
   data() {
     return {
+      formCount:0,
+      formFinishCount:0,
       formPreview: {
         templateSn: null
       },
diff --git a/src/views/business/form/nonTrial/list.vue b/src/views/business/form/nonTrial/list.vue
index 0b79e90..3fe872e 100644
--- a/src/views/business/form/nonTrial/list.vue
+++ b/src/views/business/form/nonTrial/list.vue
@@ -74,7 +74,8 @@
 
           <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="$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" />
           
diff --git a/src/views/business/study/comp/sign.vue b/src/views/business/study/comp/sign.vue
index 78ba767..ebe96aa 100644
--- a/src/views/business/study/comp/sign.vue
+++ b/src/views/business/study/comp/sign.vue
@@ -24,7 +24,13 @@
               </el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="24" v-if="$i18n.locale === 'zh_CN'">
+          <el-col :span="24">
+            <el-form-item :label="$t('form.signer')">
+              <el-input type="text" v-model="form.qmrMc" maxlength="50" disabled
+                :placeholder="$t('form.placeholderInput')" />
+            </el-form-item>
+          </el-col>
+          <!-- <el-col :span="24" v-if="$i18n.locale === 'zh_CN'">
             <el-form-item :label="$t('form.signer')">
               <el-input type="text" v-model="form.qmrMc" maxlength="50" disabled
                 :placeholder="$t('form.placeholderInput')" />
@@ -35,7 +41,7 @@
               <el-input type="text" v-model="form.qmrMcEn" maxlength="50" disabled
                 :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
-          </el-col>
+          </el-col> -->
           <el-col :span="24">
             <el-form-item :label="$t('form.password')" prop="qmrmm">
               <el-input type="password" v-model="form.qmrmm" maxlength="20" :placeholder="$t('form.placeholderInput')" autocomplete="off" auto-complete="new-password" />
diff --git a/src/views/business/study/comp/syxx.vue b/src/views/business/study/comp/syxx.vue
index da0977e..88ad6ef 100644
--- a/src/views/business/study/comp/syxx.vue
+++ b/src/views/business/study/comp/syxx.vue
@@ -35,7 +35,7 @@
             </el-form-item>
           </el-col>
           <el-col>
-            <el-button type="primary" @click="sdsy" v-hasPermi="['business:study:sd']" v-if="(studyInfo.leader==id || checkRole(['TFM'])) && studyInfo.status!=5">{{ $t('page.business.study.studyFormPlan.sdsy') }}</el-button>
+            <el-button type="primary" @click="sdsy" v-hasPermi="['business:study:sd']" v-if="(studyInfo.leader==id || checkRole(['TFM'])) && studyInfo.status!=5 && studyInfo.formCount===studyInfo.formFinishCount">{{ $t('page.business.study.studyFormPlan.sdsy') }}</el-button>
           </el-col>
         </el-row>
       </el-form>
diff --git a/src/views/business/study/list.vue b/src/views/business/study/list.vue
index a8d1dbc..f928fae 100644
--- a/src/views/business/study/list.vue
+++ b/src/views/business/study/list.vue
@@ -74,7 +74,8 @@
 
           <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="$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('form.operate')" fixed="right" align="center" width="200">