From 1401d0432389be84ba126d5059ab25cf21c6e73e Mon Sep 17 00:00:00 2001
From: "15881625488@163.com" <15881625488@163.com>
Date: Fri, 17 Apr 2026 09:59:02 +0800
Subject: [PATCH] =?UTF-8?q?fix:[=E7=89=B9=E6=AE=8A=E8=A1=A8=E5=8D=95]?=
 =?UTF-8?q?=E8=A7=82=E5=AF=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/lang/en/template/dl.js                         |   6 +-
 src/lang/zh/template/dl.js                         |   6 +-
 .../business/comps/template/comps/dl/DL011.vue     | 165 +++++++++++++--------
 3 files changed, 112 insertions(+), 65 deletions(-)

diff --git a/src/lang/en/template/dl.js b/src/lang/en/template/dl.js
index ce4ba9a..6262c50 100644
--- a/src/lang/en/template/dl.js
+++ b/src/lang/en/template/dl.js
@@ -168,7 +168,11 @@ export default {
     pytjText: 'Culture Conditions',
     pykssj: 'Culture Start Time',
     pykssjButton: 'Start',
-    bqdy: 'Label Print'
+    bqdy: 'Label Print',
+    gcbz:'View Remark',
+    czrqm:'Signed By',
+    czrqmsj:'Date',
+    xbfshzk:'Post-thaw cell condition'
   },
   dl012: {
     ...common,
diff --git a/src/lang/zh/template/dl.js b/src/lang/zh/template/dl.js
index c1eae5f..409e055 100644
--- a/src/lang/zh/template/dl.js
+++ b/src/lang/zh/template/dl.js
@@ -165,7 +165,11 @@ export default {
     pytjText: '培养条件',
     pykssj: '培养开始时间',
     pykssjButton: '开始',
-    bqdy: '标签打印'
+    bqdy: '标签打印',
+    gcbz:'观察备注',
+    czrqm:'操作人签名',
+    czrqmsj:'操作人签名时间',
+    xbfshzk:'细胞复苏后状况'
   },
   dl012: {
     ...common,
diff --git a/src/views/business/comps/template/comps/dl/DL011.vue b/src/views/business/comps/template/comps/dl/DL011.vue
index 79084d6..0fb564e 100644
--- a/src/views/business/comps/template/comps/dl/DL011.vue
+++ b/src/views/business/comps/template/comps/dl/DL011.vue
@@ -8,24 +8,11 @@
       </div>
       <div class="detail-content">
         <div class="content">
-          <BaseInfoFormPackage
-            fieldItemLabel="template.common.baseInfo"
-            label="template.common.baseInfo"
-            :ref="refConf.base"
-            :formConfig="baseInfoFormConfig"
-            :formData="formData"
-          />
+          <BaseInfoFormPackage fieldItemLabel="template.common.baseInfo" label="template.common.baseInfo"
+            :ref="refConf.base" :formConfig="baseInfoFormConfig" :formData="formData" />
 
-          <TableList
-            label="template.common.reagentInfo"
-            :columns="sysjColumns"
-            :dataSource="resourceSj"
-          />
-          <TableList
-            label="template.common.instrumentInfo"
-            :columns="yqColumns"
-            :dataSource="yqResource"
-          />
+          <TableList label="template.common.reagentInfo" :columns="sysjColumns" :dataSource="resourceSj" />
+          <TableList label="template.common.instrumentInfo" :columns="yqColumns" :dataSource="yqResource" />
 
           <!-- 细胞信息 -->
           <LineLabel label="template.dl.dl011.xbxx" />
@@ -35,14 +22,8 @@
                 $t('template.dl.dl011.bqdy')
               }}</el-button>
             </div>
-            <BaseInfoFormPackage
-              fieldItemLabel=""
-              label=""
-              :ref="refConf.xbxx"
-              :formConfig="xbxxConfig"
-              @onRegentSubmit="(data) => onTableRegentSubmit(data)"
-              :formData="formData"
-            />
+            <BaseInfoFormPackage fieldItemLabel="" label="" :ref="refConf.xbxx" :formConfig="xbxxConfig"
+              @onRegentSubmit="(data) => onTableRegentSubmit(data)" :formData="formData" />
           </div>
 
           <LineLabel label="template.dl.dl011.fxbz" />
@@ -51,24 +32,55 @@
           <!-- 预留区域 - 培养信息 -->
           <LineLabel label="template.dl.dl011.pyxx" />
           <div class="template-form-item">
-            <BaseInfoFormPackage
-              fieldItemLabel=""
-              label=""
-              :ref="refConf.pyxx"
-              :formConfig="pyxxConfig"
-              :formData="formData"
-              @onRegentSubmit="(data) => onTableRegentSubmit(data)"
-              @clickButton="handlePyxxClickButton"
-            />
+            <BaseInfoFormPackage fieldItemLabel="" label="" :ref="refConf.pyxx" :formConfig="pyxxConfig"
+              :formData="formData" @onRegentSubmit="(data) => onTableRegentSubmit(data)"
+              @clickButton="handlePyxxClickButton" />
           </div>
 
-          <BaseInfoFormPackage
-            fieldItemLabel="template.dl.dl007.bz"
-            label="template.dl.dl007.bz"
-            :ref="refConf.remark"
-            :formConfig="remarkConfig"
-            :formData="formData"
-          />
+          <BaseInfoFormPackage fieldItemLabel="template.dl.dl007.bz" label="template.dl.dl007.bz" :ref="refConf.remark"
+            :formConfig="remarkConfig" :formData="formData" />
+          <template v-if="jcgjList.length > 0">
+            <LineLabel label="template.dl.dl011.xbfshzk" />
+            <div v-for="(item, index) in jcgjList" :key="index" class="guancha-content">
+              <div style="display: flex; margin-top: 20px;"  v-if="lang=='zh'">
+                <div style="width: 100px; text-align: right;">{{ JSON.parse(item.jcnr)[0].name }}</div>
+                <div style="width: 800px; padding-left: 10px;">
+                  <el-input v-model="JSON.parse(item.jcnr)[0].value" :disabled="true">
+                  </el-input>
+                </div>
+              </div>
+               <div style="display: flex; margin-top: 20px;"  v-if="lang=='en'">
+                <div style="width: 100px; text-align: right;">{{ JSON.parse(item.jcnrEn)[0].name }}</div>
+                <div style="width: 800px; padding-left: 10px;">
+                  <el-input v-model="JSON.parse(item.jcnrEn)[0].value" :disabled="true">
+                  </el-input>
+                </div>
+              </div>
+              <div style="display: flex; margin-top: 20px;">
+                <div style="width: 100px; text-align: right;">{{ $t('template.dl.dl011.gcbz') }}</div>
+                <div style="width: 800px; padding-left: 10px;">
+                  <el-input type="textarea" :rows="4" :disabled="true" v-model="item.remark">
+                  </el-input>
+                </div>
+              </div>
+              <div style="display: flex; margin-top: 20px;margin-left: 110px; justify-content: space-between; width: 800px;">
+                <div style="width: 150px; ">
+                  <div>{{ $t('template.dl.dl011.czrqm') }}</div>
+                  <div style="margin-top: 10px;">
+                    <el-input v-model="item.qmrMc" :disabled="true">
+                    </el-input>
+                  </div>
+                </div>
+                <div style="width: 150px;">
+                  <div>{{ $t('template.dl.dl011.czrqmsj') }}</div>
+                  <div style="margin-top: 10px;">
+                    <el-input v-model="item.createTime" :disabled="true">
+                    </el-input>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </template>
         </div>
       </div>
     </div>
@@ -76,6 +88,7 @@
 </template>
 
 <script>
+import { studyFormFill_jcgj } from "@/api/business/study/studyFormFill"
 import BaseInfoFormPackage from '@/components/Template/BaseInfoFormPackage'
 import TableOpertaionDelete from '@/components/Template/operation/TableOpertaionDelete.vue'
 import CustomTable from '@/components/Template/CustomTable.vue'
@@ -110,9 +123,9 @@ export default {
   mixins: [templateMixin],
   provide() {
     return {
-      getMybh: ()=>{
+      getMybh: () => {
         const data = this.$refs[refConf.xbxx].getFilledFormData()
-        return {mybh:data.fshxbbh+data.fshxbbhCodeSn,maxVolume:data.fshxbsjtj,maxVolumeUnit:data.fshxbsjtjUnit}
+        return { mybh: data.fshxbbh + data.fshxbbhCodeSn, maxVolume: data.fshxbsjtj, maxVolumeUnit: data.fshxbsjtjUnit }
       }
     }
   },
@@ -208,21 +221,21 @@ export default {
             pykssj:
               this.fillType === 'actFill'
                 ? {
-                    label: 'template.dl.dl011.pykssj',
-                    type: 'input',
-                    fillType: 'actFill',
-                    subType: 'button',
-                    subKey: 'pykssjButton',
-                    disabled: true,
-                    subDisabled: false,
-                    buttonName: 'template.dl.dl011.pykssjButton'
-                  }
+                  label: 'template.dl.dl011.pykssj',
+                  type: 'input',
+                  fillType: 'actFill',
+                  subType: 'button',
+                  subKey: 'pykssjButton',
+                  disabled: true,
+                  subDisabled: false,
+                  buttonName: 'template.dl.dl011.pykssjButton'
+                }
                 : {
-                    label: 'template.dl.dl011.pykssj',
-                    type: 'input',
-                    fillType: 'actFill',
-                    disabled: true
-                  }
+                  label: 'template.dl.dl011.pykssj',
+                  type: 'input',
+                  fillType: 'actFill',
+                  disabled: true
+                }
           }
         }
       ]
@@ -273,8 +286,8 @@ export default {
               compareTo: 'fshxbyjtj',
               subOptions: this.getDictOptions('business_tjdw'),
               maxlength: 10,
-              subDisabled:true
-              
+              subDisabled: true
+
             }
           }
         }
@@ -299,10 +312,10 @@ export default {
 
     // 只在实际填报模式下生成编号
     if (this.fillType !== 'actFill') return
-    
+
     const data = this.getFilledFormDataByRefs([refConf.xbxx])
-    if(!data.fshxbsjtjUnit){
-      this.$refs[refConf.xbxx].batchUpdateFormData({'fshxbsjtjUnit':data.fshxbyjtjUnit})
+    if (!data.fshxbsjtjUnit) {
+      this.$refs[refConf.xbxx].batchUpdateFormData({ 'fshxbsjtjUnit': data.fshxbyjtjUnit })
     }
     // 触发数据更新
     setTimeout(() => {
@@ -330,10 +343,25 @@ export default {
   data() {
     return {
       formData: {},
+      jcgjList: [],
+      lang: this.$store.getters.language.split("_")[0],
       refConf
     }
   },
+  created() {
+    this.getJjcgjList()
+  },
   methods: {
+    getJjcgjList() {
+      studyFormFill_jcgj({
+        pageNum: 1,
+        jcmc: '生长情况',
+        formId: this.templateData.id,
+        pageSize: 99,
+      }).then(response => {
+        this.jcgjList = response.rows
+      })
+    },
     onTableRegentSubmit(data) {
       if (data.key === 'xbdcbh') {
         this.$refs.xbxxRef.updateFormData('xbdcbh_tj', data.selectInfo.row.tj)
@@ -435,7 +463,7 @@ export default {
         tmpResource,
         stepResource.sjResource || []
       )
-      this.yqResourceTmp = uniqeYqOne([...stepResource.yqResource || [],...tmpYq])
+      this.yqResourceTmp = uniqeYqOne([...stepResource.yqResource || [], ...tmpYq])
       return this.resourceTmp
     },
     // 保存
@@ -470,4 +498,15 @@ export default {
   font-size: 16px;
   color: #303133;
 }
+.guancha-content{
+  background: #fff;
+    padding: 20px;
+    border-radius: 8px;
+    -webkit-box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+    box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+    margin-top: 20px;
+    padding: 20px;
+    border-radius: 5px 5px;
+    page-break-inside: avoid;
+}
 </style>