From 546bc81c86453e238134e9acd089cb9f43d78e39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167>
Date: Mon, 27 Mar 2023 10:57:51 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=85=E5=8A=9E=E4=B8=AD=E5=BF=83-=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E6=B3=95=E8=A7=84=E4=BB=BB=E5=8A=A1-=E8=8B=B1?=
 =?UTF-8?q?=E6=96=87=E7=89=88=E6=9C=AC-=E6=93=8D=E4=BD=9C=E5=88=97?=
 =?UTF-8?q?=E6=B2=A1=E6=9C=89=E5=AF=B9=E9=BD=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/circulationHistory.vue          |  5 +++++
 .../components/taskCirculationHistory.vue      |  8 ++++++--
 .../components/referenceDeliverablesList.vue   | 18 +++++++++++++-----
 .../components/dealtWith.vue                   |  6 +++---
 4 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/jero-web/src/views/processCenter/components/circulationHistory.vue b/jero-web/src/views/processCenter/components/circulationHistory.vue
index 285a5462e..8244fd372 100644
--- a/jero-web/src/views/processCenter/components/circulationHistory.vue
+++ b/jero-web/src/views/processCenter/components/circulationHistory.vue
@@ -47,18 +47,21 @@
             title: this.$t('OperationNode'),
             dataIndex: 'name',
             align: 'left',
+            ellipsis: true,
             width:200,
           },
           {
             title: this.$t('Operator'),
             dataIndex: 'assignee',
             align: 'left',
+            ellipsis: true,
             width:200,
           },
           {
             title: this.$t('result'),
             dataIndex: 'approvalResult',
             align: 'left',
+            ellipsis: true,
             width:200,
             scopedSlots: { customRender: 'approvalResult' }
           },
@@ -66,6 +69,7 @@
             title: this.$t('opinion'),
             dataIndex: 'approvalOpinion',
             align: 'left',
+            ellipsis: true,
             width:200,
           },
           {
@@ -73,6 +77,7 @@
             dataIndex: 'createTime',
             align: 'left',
             width:200,
+            ellipsis: true,
             customRender: function(t, r, index) {
               return moment(t).format('YYYY-MM-DD HH:mm:ss')
             }
diff --git a/jero-web/src/views/processCenter/components/taskCirculationHistory.vue b/jero-web/src/views/processCenter/components/taskCirculationHistory.vue
index c0018a077..e0518337c 100644
--- a/jero-web/src/views/processCenter/components/taskCirculationHistory.vue
+++ b/jero-web/src/views/processCenter/components/taskCirculationHistory.vue
@@ -15,7 +15,7 @@
         :data-source="dataSource"
         :columns="columns"
       >
-        <span slot="reviewResult" slot-scope="text,result">
+        <span slot="reviewResult" :title="text" slot-scope="text,result">
             {{text}}
         </span>
       </a-table>
@@ -49,18 +49,21 @@
             title: this.$t('OperationNode'),
             dataIndex: 'name',
             align: 'left',
+            ellipsis: true,
             width: 470
           },
           {
             title: this.$t('Operator'),
             dataIndex: 'assignee',
             align: 'left',
+            ellipsis: true,
             width: 270
           },
           {
             title: this.$t('result'),
             dataIndex: 'reviewResult',
             align: 'left',
+            ellipsis: true,
             scopedSlots: { customRender: 'reviewResult' },
             width: 270
           },
@@ -68,14 +71,15 @@
             title: this.$t('opinion'),
             dataIndex: 'approvalOpinion',
             align: 'left',
+            ellipsis: true,
             width: 270
           },
           {
             title: this.$t('operationTime'),
             dataIndex: 'createTime',
             align: 'left',
+            ellipsis: true,
             width: 200,
-            fixed: 'right'
           }
         ],
         downLoadFileUrl: window._CONFIG['domianPreviewURL'] + '/sys/common/download'
diff --git a/jero-web/src/views/projectManagement/components/certificationList/components/referenceDeliverablesList.vue b/jero-web/src/views/projectManagement/components/certificationList/components/referenceDeliverablesList.vue
index 642b23e65..4098e6e3b 100644
--- a/jero-web/src/views/projectManagement/components/certificationList/components/referenceDeliverablesList.vue
+++ b/jero-web/src/views/projectManagement/components/certificationList/components/referenceDeliverablesList.vue
@@ -88,7 +88,7 @@
             align: 'left',
             ellipsis: true,
             width: 223
-          },
+          }
         ],
         dataList: [],
         content: [],
@@ -96,7 +96,7 @@
         pageNo: 1,
         pageSize: 10,
         total: 0,
-        ids:'',
+        ids: ''
       }
     },
     mounted() {
@@ -165,19 +165,27 @@
           }).then((res) => {
             if (res.success) {
               this.confirmLoading = false
-              this.$message.success(this.$t('OperationSuccessful'))
+              if (res.result) {
+                this.$message.warning(res.result)
+              } else {
+                this.$message.success(this.$t('OperationSuccessful'))
+              }
               this.visible = false
               this.selectedRowKeys = []
               this.$emit('referenceDeliverablesListForm')
             } else {
-              this.$message.warning(this.$t('operationFailed'))
+              if (res.result) {
+                this.$message.warning(res.result)
+              } else {
+                this.$message.warning(this.$t('operationFailed'))
+              }
               this.confirmLoading = false
             }
           })
         } else {
           this.$message.warning(this.$t('selectLeastOne'))
         }
-      },
+      }
     }
   }
 </script>
diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue
index a8fbd1fcf..f358d744f 100644
--- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue
+++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/dealtWith.vue
@@ -78,7 +78,7 @@
             dataIndex: 'projectName',
             ellipsis: true,
             scopedSlots: { customRender: 'RelatedItems' },
-            width: 110
+            width: 150
           },
           {
             title: this.$t('standardInformation'),
@@ -121,7 +121,7 @@
             align: 'left',
             dataIndex: 'endTime',
             ellipsis: true,
-            width: 110,
+            width: 160,
             scopedSlots: { customRender: 'endTime' }
           },
           // {
@@ -136,7 +136,7 @@
             title: this.$t('operation'),
             align: 'left',
             fixed: 'right',
-            width: 80,
+            width: 120,
             scopedSlots: { customRender: 'operation' }
           }
         ],