From 36b543f724fbcc960e70bdbfbcaa8909bcd048b3 Mon Sep 17 00:00:00 2001
From: luojie <125330818@qq.com>
Date: Thu, 15 Jan 2026 21:41:48 +0800
Subject: [PATCH] =?UTF-8?q?feat:[=E6=A8=A1=E6=9D=BF=E7=AE=A1=E7=90=86][?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Template/BaseInfoFormPcakge.vue     |  2 +-
 src/components/Template/CustomTable.vue            |  2 +-
 src/components/Template/HandleFormItem.vue         | 30 +++++++++++++---------
 .../business/comps/template/TemplateTable.vue      | 10 ++++++++
 src/views/business/study/comp/jhbd/Fh.vue          |  2 +-
 src/views/business/study/comp/sqbd/Fh.vue          |  2 +-
 src/views/business/study/comp/tbbd/Fh.vue          |  2 +-
 7 files changed, 33 insertions(+), 17 deletions(-)

diff --git a/src/components/Template/BaseInfoFormPcakge.vue b/src/components/Template/BaseInfoFormPcakge.vue
index 8a0311f..277f888 100644
--- a/src/components/Template/BaseInfoFormPcakge.vue
+++ b/src/components/Template/BaseInfoFormPcakge.vue
@@ -130,7 +130,7 @@
                                 :value="formFields[sItem.subKey]" />
                             <div v-show="isShowOther(formFields[sItem.subKey])" class="flex flex1">
                                 <div class="other-title">其他</div>
-                                <div class="flex">
+                                <div class="flex flex1">
                                     <HandleFormItem :field-item-label="fieldItemLabel" :field-key="prefixKey+'_'+sItem.otherCode" @blur="onBlur(key, $event)" :item="getOtherItem(sItem)"
                                         v-model="formFields[sItem.otherCode]" @copy="onCopy(sItem, key)"
                                         :error="errors[sItem.otherCode]" @update:error="errors[sItem.otherCode] = false"
diff --git a/src/components/Template/CustomTable.vue b/src/components/Template/CustomTable.vue
index 1ce3792..afd1d33 100644
--- a/src/components/Template/CustomTable.vue
+++ b/src/components/Template/CustomTable.vue
@@ -9,7 +9,7 @@
               <div>{{ $t(col.label) }}</div>
               <template
                 v-if="col.headerSelectKey && col.headerOptions && (showHeaderSelect || templateFillType === 'preFill')">
-                <HandleFormItem :fieldKey="prefixKey+'_'+col.headerSelectKey+'_'+rowIndex" :fieldItemLabel="fieldItemLabel" type="select" class="header-select" :item="getHeaderItem(col)"
+                <HandleFormItem :fieldKey="prefixKey+'_'+col.headerSelectKey" :fieldItemLabel="fieldItemLabel" type="select" class="header-select" :item="getHeaderItem(col)"
                   v-model="headerSelectFields[col.headerSelectKey]" @change="onHeaderSelectChange(col, $event)"
                   :error="hasError(-1, index, col.headerSelectKey)"
                   @update:error="onErrorUpdate(-1, index, col.headerSelectKey, $event)" />
diff --git a/src/components/Template/HandleFormItem.vue b/src/components/Template/HandleFormItem.vue
index ae6b245..c9d4449 100644
--- a/src/components/Template/HandleFormItem.vue
+++ b/src/components/Template/HandleFormItem.vue
@@ -57,7 +57,7 @@
                         <div class="record-row" v-if="currentRecordType === 'fieldChanged'">
                             <div>
                                 <span>{{ index + 1 }}.</span>
-                                <span> {{ record.userName }} </span>
+                                <span> {{ getUserName(record) }} </span>
                                 <span>{{ record.time }} </span>
                                 <span>{{ modificationRecords.length-1==index?"填写":"修改记录" }}</span>
                             </div>
@@ -69,12 +69,12 @@
                         <!-- 回复记录 -->
                         <div class="record-row" v-if="currentRecordType === 'replyRecord'">
                             <div>
-                                <span> {{ record.userName }} </span>
+                                <span> {{ getUserName(record) }} </span>
                                 <span>{{ record.time }} </span>
                             </div>
                             <div>
                                 <div v-if="record.content">复核意见：{{ record.content }}</div>
-                                <div v-if="record.replay">回复意见：{{ record.replay }}</div>
+                                <div v-if="record.reply">回复意见：{{ record.reply }}</div>
                             </div>
                         </div>
                         <hr v-if="index < modificationRecords.length - 1">
@@ -82,7 +82,7 @@
                 </div>
             </div>
         </div>
-        <el-dialog append-to-body :title="templateFillType == 'actFill' ? '回复意见' : '复核意见'" :visible.sync="visible"
+        <el-dialog :close-on-click-modal = "false" append-to-body :title="templateFillType == 'actFill' ? '回复意见' : '复核意见'" :visible.sync="visible"
             width="30%">
             <el-input v-model="replyContent" type="textarea" show-word-limit resize="none" rows="8" placeholder="输入内容"
                 maxlength="500" />
@@ -176,6 +176,13 @@ export default {
     mounted() {
     },
     methods: {
+        getUserName(record){
+            const locale = this.$i18n.locale;
+            if(locale === 'zh_CN'){
+                return record.userNameCn;
+            }
+            return record.userNameEn;
+        },
         onEditSignSave(data) {
             this.handleUpdateRecord(data)
         },
@@ -211,11 +218,11 @@ export default {
                 time: moment().format("YYYY-MM-DD HH:mm:ss"),
             }
             if (this.templateFillType == 'actFill') {
-                record.replay = this.replyContent;
+                record.reply = this.replyContent;
                 const deepList = deepClone(this.getFhyjjl());//实际填报应该是修改指定的字段
                 const item = deepList.find(o => o.key == record.key);
                 if (item) {
-                    item.replay = this.replyContent;
+                    item.reply = this.replyContent;
                 }
                 this.replaceFhyjjl(deepList);//实际填报应该是修改指定的字段
             } else {
@@ -257,9 +264,9 @@ export default {
             const records = this.getReplyRecords();
             if (records.length > 0) {
                 const o = records[0];
-                if (o.replay && o.content) {//有回复意见和复核意见
+                if (o.reply && o.content) {//有回复意见和复核意见
                     return "green"
-                } else if (o.content && !o.replay) {//只有复核意见
+                } else if (o.content && !o.reply) {//只有复核意见
                     return "orange"
                 } else {
                     return "gray"
@@ -329,7 +336,7 @@ export default {
                     if (!o.reply && templateFillType == 'qc') {//如果填报人员没有回复，qc点击的时候需要回填上次填报的信息
                         content = o.content;
                     } else if (!o.content && templateFillType == 'actFill') {//如果qc没有复核，填报点击的时候需要回填上次填报的信息
-                        content = o.replay;
+                        content = o.reply;
                     }
                 }
                 this.replyContent = content;
@@ -384,14 +391,13 @@ export default {
             if (data) {
                 record.reason = data.remark
             }
+            this.updateZdxgjl(record);
             const params = {
                 type: "fieldChanged",
                 newRecord: record,
-                resourceList: deepClone(this.getZdxgjl()),
+                resourceList: this.getZdxgjl(),
             }
-            console.log(params,"params")
             EventBus.$emit('onModifyRecord', params,)
-            this.updateZdxgjl(record);
             //用户输入密码并点击确定，保存修改
             this.oldValue = this.inputValue; // 更新旧值
             this.$emit("blur", this.inputValue);
diff --git a/src/views/business/comps/template/TemplateTable.vue b/src/views/business/comps/template/TemplateTable.vue
index 3993af4..163d8e0 100644
--- a/src/views/business/comps/template/TemplateTable.vue
+++ b/src/views/business/comps/template/TemplateTable.vue
@@ -130,6 +130,15 @@ export default {
   },
   methods: {
     async getFormData() {
+      if(this.fillType === "actFill"){
+        //检查是否有未填写的复核意见
+        const flag = this.fhyjjl.every((item)=>!!item.content && !!item.reply)
+        console.log(this.fhyjjl,flag,"flag")
+        if(!flag){
+          this.$message.error("疑问项还未回复，请回复后再提交");
+          return;
+        }
+      }
       return await this.$refs.templateComponent.getFormData();
     },
     getResource() {
@@ -148,5 +157,6 @@ export default {
 .template-table {
   background: #fff;
   padding: 10px 10px;
+  width: 100%;
 }
 </style>
\ No newline at end of file
diff --git a/src/views/business/study/comp/jhbd/Fh.vue b/src/views/business/study/comp/jhbd/Fh.vue
index 996b830..a749100 100644
--- a/src/views/business/study/comp/jhbd/Fh.vue
+++ b/src/views/business/study/comp/jhbd/Fh.vue
@@ -189,7 +189,7 @@ export default {
         studyFormPlan_updateFhyjjl(
           {
             id: this.form.id,
-            replay: JSON.stringify(data.newRecord),
+            reply: JSON.stringify(data.newRecord),
             fhyjjl: JSON.stringify(data.resourceList)
           }
         ).then(response => {
diff --git a/src/views/business/study/comp/sqbd/Fh.vue b/src/views/business/study/comp/sqbd/Fh.vue
index 249fe81..c7b1ca1 100644
--- a/src/views/business/study/comp/sqbd/Fh.vue
+++ b/src/views/business/study/comp/sqbd/Fh.vue
@@ -189,7 +189,7 @@ export default {
         studyFormApply_updateFhyjjl(
           {
             id: this.form.id,
-            replay: JSON.stringify(data.newRecord),
+            reply: JSON.stringify(data.newRecord),
             fhyjjl: JSON.stringify(data.resourceList)
           }
         ).then(response => {
diff --git a/src/views/business/study/comp/tbbd/Fh.vue b/src/views/business/study/comp/tbbd/Fh.vue
index 42dc0f8..321e60e 100644
--- a/src/views/business/study/comp/tbbd/Fh.vue
+++ b/src/views/business/study/comp/tbbd/Fh.vue
@@ -191,7 +191,7 @@ export default {
         studyFormFill_updateFhyjjl(
           {
             id: this.form.id,
-            replay: JSON.stringify(data.newRecord),
+            reply: JSON.stringify(data.newRecord),
             fhyjjl: JSON.stringify(data.resourceList)
           }
         ).then(response => {