From 67a3c4f9269c3fc7ec8d775af7d887e90656351f Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Wed, 8 Jan 2025 14:26:45 +0800
Subject: [PATCH] =?UTF-8?q?1.07=E9=83=A8=E5=88=86=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../attachments/attachment-management/index.vue  | 16 ++++++++--------
 .../attachments/self-attachment/index.vue        | 10 +++++-----
 .../components/needSignedSysDoc.vue              |  6 ++++++
 static/pdfjs/web/viewer.js                       |  3 ++-
 4 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/src/views/trials/trials-panel/attachments/attachment-management/index.vue b/src/views/trials/trials-panel/attachments/attachment-management/index.vue
index 45e9080a..1f4cfd33 100644
--- a/src/views/trials/trials-panel/attachments/attachment-management/index.vue
+++ b/src/views/trials/trials-panel/attachments/attachment-management/index.vue
@@ -76,7 +76,7 @@
             style="width: 120px"
           >
             <el-option
-              v-for="i of $d.YesOrNo"
+              v-for="i of $d.TrainingStatusEnum"
               :key="'IsConfirmed' + i.label"
               :value="i.value"
               :label="i.label"
@@ -90,7 +90,7 @@
             style="width: 120px"
           >
             <el-option
-              v-for="i of $d.YesOrNo"
+              v-for="i of $d.TrainingStatus"
               :key="'IsDeleted' + i.label"
               :value="i.value"
               :label="i.label"
@@ -175,11 +175,11 @@
           sortable="custom"
         >
           <template slot-scope="scope">
-            <el-tag v-if="scope.row.IsDeleted" type="danger">{{
-              $fd('YesOrNo', scope.row.IsDeleted)
+            <el-tag v-if="!scope.row.IsDeleted" type="danger">{{
+              $fd('TrainingStatus', scope.row.IsDeleted)
             }}</el-tag>
             <el-tag v-else type="primary">{{
-              $fd('YesOrNo', scope.row.IsDeleted)
+              $fd('TrainingStatus', scope.row.IsDeleted)
             }}</el-tag>
           </template>
         </el-table-column>
@@ -199,11 +199,11 @@
           sortable="custom"
         >
           <template slot-scope="scope">
-            <el-tag v-if="!scope.row.IsConfirmed" type="primary">{{
-              $fd('YesOrNo', scope.row.IsConfirmed)
+            <el-tag v-if="scope.row.IsConfirmed" type="primary">{{
+              $fd('TrainingStatusEnum', scope.row.IsConfirmed)
             }}</el-tag>
             <el-tag v-else type="danger">{{
-              $fd('YesOrNo', scope.row.IsConfirmed)
+              $fd('TrainingStatusEnum', scope.row.IsConfirmed)
             }}</el-tag>
           </template>
         </el-table-column>
diff --git a/src/views/trials/trials-panel/attachments/self-attachment/index.vue b/src/views/trials/trials-panel/attachments/self-attachment/index.vue
index 4539d256..98b3e6f2 100644
--- a/src/views/trials/trials-panel/attachments/self-attachment/index.vue
+++ b/src/views/trials/trials-panel/attachments/self-attachment/index.vue
@@ -25,7 +25,7 @@
         <!-- 是否签署 -->
         <el-form-item :label="$t('trials:self-attachment:table:isSign')">
           <el-select v-model="searchData.IsSign" clearable style="width:120px;">
-            <template v-for="item of $d.YesOrNo">
+            <template v-for="item of $d.TrainingStatusEnum">
               <el-option  v-if="item.raw.ValueCN !== '无'" :label="item.label" :value="item.value" :key="item.id"/>
             </template>
           </el-select>
@@ -77,8 +77,8 @@
           sortable="custom"
         >
           <template slot-scope="scope">
-            <el-tag v-if="scope.row.IsDeleted" type="danger">{{ $fd('YesOrNo', scope.row.IsDeleted) }}</el-tag>
-            <el-tag v-else type="primary">{{ $fd('YesOrNo', scope.row.IsDeleted) }}</el-tag>
+            <el-tag v-if="!scope.row.IsDeleted" type="danger">{{ $fd('TrainingStatus', scope.row.IsDeleted) }}</el-tag>
+            <el-tag v-else type="primary">{{ $fd('TrainingStatus', scope.row.IsDeleted) }}</el-tag>
           </template>
         </el-table-column>
         <!-- 上传时间 -->
@@ -96,8 +96,8 @@
           sortable="custom"
         >
           <template slot-scope="scope">
-            <el-tag v-if="scope.row.IsConfirmed" type="primary">{{ $fd('YesOrNo', scope.row.IsConfirmed) }}</el-tag>
-            <el-tag v-else type="danger">{{ $fd('YesOrNo', scope.row.IsConfirmed) }}</el-tag>
+            <el-tag v-if="scope.row.IsConfirmed" type="primary">{{ $fd('TrainingStatusEnum', scope.row.IsConfirmed) }}</el-tag>
+            <el-tag v-else type="danger">{{ $fd('TrainingStatusEnum', scope.row.IsConfirmed) }}</el-tag>
           </template>
         </el-table-column>
         <!-- 签署时间 -->
diff --git a/src/views/trials/trials-workbench/components/needSignedSysDoc.vue b/src/views/trials/trials-workbench/components/needSignedSysDoc.vue
index 31e97e91..c5dd013f 100644
--- a/src/views/trials/trials-workbench/components/needSignedSysDoc.vue
+++ b/src/views/trials/trials-workbench/components/needSignedSysDoc.vue
@@ -42,6 +42,12 @@
         show-overflow-tooltip
         sortable="custom"
       />
+      <el-table-column
+        :label="$t('trials:sysDocBeSigned:table:ConfirmTime')"
+        prop="ConfirmTime"
+        show-overflow-tooltip
+        sortable="custom"
+      />
       <el-table-column
         :label="$t('common:action:action')"
         width="140"
diff --git a/static/pdfjs/web/viewer.js b/static/pdfjs/web/viewer.js
index bf2c94fd..d87d8b4f 100644
--- a/static/pdfjs/web/viewer.js
+++ b/static/pdfjs/web/viewer.js
@@ -12380,7 +12380,8 @@ class PDFPageView {
           c.style.color = "rgba(0, 191, 255, 0.1)";
           c.style.whiteSpace = 'nowrap'
           // c.innerText = text;//text为水印内容，可以在viewer.html中传入，也可以直接替换成固定的字符串如：c.innerText = "这是一个水印";
-          c.innerText = `${obj.COMPANY}_${obj.userName}\n${new Date().format('yyyy-MM-dd')}`;
+          // c.innerText = `${obj.COMPANY}_${obj.userName}\n${new Date().format('yyyy-MM-dd')}`;
+          c.innerText = `${obj.userName}\n${new Date().format('yyyy-MM-dd')}`;
           cover.appendChild(c);
         }
       }