From eefdb524bcce7be91c1ca3839c898408a4b3b69a Mon Sep 17 00:00:00 2001
From: baoyu <102349094+Bytq@users.noreply.github.com>
Date: Thu, 28 Mar 2024 14:09:57 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E5=87=86/=E8=AF=91=E6=96=87=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E7=94=B3=E8=AF=B7=20=E6=9F=A5=E7=9C=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/detailModal.vue                | 27 ++++++++++---------
 .../index.vue                                 |  2 +-
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/components/detailModal.vue b/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/components/detailModal.vue
index c1ab0b7fd..5fda9c846 100644
--- a/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/components/detailModal.vue
+++ b/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/components/detailModal.vue
@@ -13,62 +13,62 @@
       <el-row>
         <el-col :span="12">
           <el-form-item label="申请单位"  label-width="100px" class="add-form-item">
-            <span>{{StandardApplyForEO.applyForUnitId}}</span>
+            <span>{{StandardApplyForEO.applyForUnitName ? StandardApplyForEO.applyForUnitName : '--'}}</span>
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="申请人"  label-width="100px" class="add-form-item">
-            <span>{{StandardApplyForEO.applyForUserId}}</span>
+            <span>{{StandardApplyForEO.applyForUserName ? StandardApplyForEO.applyForUserName : '--'}}</span>
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="类型"  label-width="100px" class="add-form-item">
-            <span>{{StandardApplyForEO.type}}</span>
+            <span>{{StandardApplyForEO.type ? StandardApplyForEO.type : '--'}}</span>
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="标准类型"  label-width="100px" class="add-form-item">
-            <span>{{StandardApplyForEO.standType}}</span>
+            <span>{{StandardApplyForEO.standType ? StandardApplyForEO.standType : '--'}}</span>
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="标准类别"  label-width="100px" class="add-form-item">
-            <span>{{StandardApplyForEO.standLb}}</span>
+            <span>{{StandardApplyForEO.standLb ? StandardApplyForEO.standLb : '--'}}</span>
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="标准编号"  label-width="100px" class="add-form-item">
-            <span>{{StandardApplyForEO.standNum}}</span>
+            <span>{{StandardApplyForEO.standNum ? StandardApplyForEO.standNum : '--'}}</span>
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="标准年份"  label-width="100px" class="add-form-item">
-            <span>{{StandardApplyForEO.standYear}}</span>
+            <span>{{StandardApplyForEO.standYear ? StandardApplyForEO.standYear : '--'}}</span>
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="需求时间"  label-width="100px" class="add-form-item">
-            <span>{{StandardApplyForEO.requiredTime}}</span>
+            <span>{{StandardApplyForEO.requiredTime ? StandardApplyForEO.requiredTime : '--'}}</span>
           </el-form-item>
         </el-col>
         <el-col :span="24">
           <el-form-item label="标准名称"  label-width="100px" class="add-form-item">
-            <span>{{StandardApplyForEO.standName}}</span>
+            <span>{{StandardApplyForEO.standName ? StandardApplyForEO.standName : '--'}}</span>
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="原语言"  label-width="100px" class="add-form-item">
-            <span>{{StandardApplyForEO.sourceLanguage}}</span>
+            <span>{{StandardApplyForEO.sourceLanguage ? StandardApplyForEO.sourceLanguage : '--'}}</span>
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="目标语言"  label-width="100px" class="add-form-item">
-            <span>{{StandardApplyForEO.targetLanguage}}</span>
+            <span>{{StandardApplyForEO.targetLanguage ? StandardApplyForEO.targetLanguage : '--'}}</span>
           </el-form-item>
         </el-col>
         <el-col :span="24">
           <el-form-item label="理由"  label-width="100px" class="add-form-item">
-            <span>{{StandardApplyForEO.reason}}</span>
+            <span>{{StandardApplyForEO.reason ? StandardApplyForEO.reason : '--'}}</span>
           </el-form-item>
         </el-col>
       </el-row>
@@ -94,10 +94,11 @@ export default {
     handleClose () {
       this.visible = false
     },
-    showModal (id) {
+    showModal (item) {
       this.visible = true
       this.$nextTick(() => {
         this.StandardApplyForEO = []
+        this.StandardApplyForEO = item
       })
     },
   }
diff --git a/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/index.vue b/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/index.vue
index f13767eee..13284a340 100644
--- a/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/index.vue
+++ b/src/pages/regulatoryRepository/standardTranslationAcquisitionRequest/index.vue
@@ -154,7 +154,7 @@
         />
         <el-table-column label="操作" align="center" width="200" fixed="right">
           <template slot-scope="scope">
-            <div class="table-operate-btn" @click="toView(scope.row.id)">查看</div>
+            <div class="table-operate-btn" @click="toView(scope.row)">查看</div>
             <div class="table-operate-btn" @click="batchPass([scope.row.id])">通过</div>
             <div class="table-operate-btn" @click="batchOverrule([scope.row.id])">驳回</div>
           </template>