From aed8378e95e39b514184cdddd9c3f37ffb8b71ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167@qq.com>
Date: Thu, 1 Sep 2022 17:38:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93=E5=B7=B2?=
 =?UTF-8?q?=E7=9F=A5bug=20=E5=AF=B9=E6=8E=A5=E6=88=91=E7=9A=84=E6=94=B6?=
 =?UTF-8?q?=E8=97=8F=E7=9A=84=E9=97=AE=E9=A2=98=E7=9F=A5=E8=AF=86=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/problemKnowledgeBaseView.vue       |  6 ++++++
 .../components/problemKnowledgeBaseList.vue       | 14 +++++++-------
 .../components/regulatoryCirculationHistory.vue   | 15 ++++++++++-----
 .../processForm/processDetails/index.vue          | 11 +++++++++--
 4 files changed, 32 insertions(+), 14 deletions(-)

diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseView.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseView.vue
index 50b3336ed..4252096b5 100644
--- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseView.vue
+++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseView.vue
@@ -228,6 +228,9 @@
           id: this.queryForm.praiseEO ? this.queryForm.praiseEO.id : undefined
         }
         putAction('/problemKnowledgeBase/problemKnowledgeBasePraiseEO/edit', query).then((res) => {
+          if (!this.queryForm.collectEO || !this.queryForm.collectEO.id) {
+            this.queryById()
+          }
         })
       },
       starClick() {
@@ -247,6 +250,9 @@
           id: this.queryForm.collectEO ? this.queryForm.collectEO.id : undefined
         }
         putAction('/problemKnowledgeBase/problemKnowledgeBaseCollectEO/edit', query).then((res) => {
+          if (!this.queryForm.collectEO || !this.queryForm.collectEO.id) {
+            this.queryById()
+          }
         })
       },
       clickButtonToUpload(item) {
diff --git a/jero-web/src/views/documentManage/collection/components/problemKnowledgeBaseList.vue b/jero-web/src/views/documentManage/collection/components/problemKnowledgeBaseList.vue
index b998e89aa..8d9566e23 100644
--- a/jero-web/src/views/documentManage/collection/components/problemKnowledgeBaseList.vue
+++ b/jero-web/src/views/documentManage/collection/components/problemKnowledgeBaseList.vue
@@ -35,9 +35,9 @@
     <div class="box-content">
       <a-checkbox-group style="width: 100%" :defaultChecked="checkboxText"
                         @change="checkboxTextChange" v-model="checkboxText">
-        <div v-for="item in conList" :key="item.id">
+        <div v-for="item in conList" :key="item.collectEO.id">
           <div style="margin-bottom: 10px;position: relative">
-            <a-checkbox :value="item.id" class="checkbox-left"></a-checkbox>
+            <a-checkbox :value="item.collectEO.id" class="checkbox-left"></a-checkbox>
             <div class="text-text-right"
                  @click="checkedClick(item)"
                  :class="{ 'null-input':item.checked }">
@@ -117,7 +117,7 @@
         if (value.length > 0) {
           this.conList.forEach(val => {
             value.forEach(res => {
-              if (res === val.id) {
+              if (res === val.collectEO.id) {
                 val.checked = true
               }
             })
@@ -183,7 +183,7 @@
         this.$confirm({
           content: _this.$t('confirmCancelCollection'),
           onOk() {
-            deleteAction(_this.url.deleteBatch, { ids: val.id }).then((res) => {
+            deleteAction(_this.url.deleteBatch, { ids: val.collectEO.id }).then((res) => {
               if (res.success) {
                 _this.$message.success(_this.$t('OperationSuccessful'))
                 _this.getList()
@@ -216,13 +216,13 @@
         }
         this.loading = true
         getAction(this.url.getInfoList, query).then((res) => {
-          if (res.success) {
+          if (res.success && res.result) {
             if (res.result.current > 1 && res.result.records.length == 0) {
               this.pageNo = 1
               this.getList()
               return
             }
-            this.conList = res.result.records
+            this.conList = res.result ? res.result.records : []
             if (this.conList && this.conList.length > 0) {
               this.conList.forEach(val => {
                 if (val.content) {
@@ -233,7 +233,7 @@
             if (this.checkboxList && this.checkboxList.length > 0) {
               let contentList = []
               for (let j = 0; j < this.conList.length; j++) {
-                contentList.push(this.conList[j].id)
+                contentList.push(this.conList[j].collectEO.id)
               }
               this.checkboxList = this.checkboxList.filter(val => {
                 return !contentList.join(',').includes(val)
diff --git a/jero-web/src/views/processCenter/components/regulatoryCirculationHistory.vue b/jero-web/src/views/processCenter/components/regulatoryCirculationHistory.vue
index 2ff41bc7f..48adc3d86 100644
--- a/jero-web/src/views/processCenter/components/regulatoryCirculationHistory.vue
+++ b/jero-web/src/views/processCenter/components/regulatoryCirculationHistory.vue
@@ -10,7 +10,7 @@
         ref="table"
         :loading="loading"
         :pagination="false"
-        :scroll="{x: true}"
+        :scroll="{x: '100%'}"
         :data-source="dataSource"
         :columns="columns"
       >
@@ -41,31 +41,36 @@
             title: this.$t('OperationContent'),
             dataIndex: 'taskDefinitionKeyName',
             align: 'center',
-            width: '20%'
+            width: '20%',
+            ellipsis: true
           },
           {
             title: this.$t('opinion'),
             dataIndex: 'approvalOpinion',
             align: 'center',
-            width: '20%'
+            width: '20%',
+            ellipsis: true
           },
           {
             title: this.$t('Operator'),
             dataIndex: 'createBy',
             align: 'center',
-            width: '20%'
+            width: '20%',
+            ellipsis: true
           },
           {
             title: this.$t('role'),
             dataIndex: 'operatorRoleName',
             align: 'center',
-            width: '20%'
+            width: '20%',
+            ellipsis: true
           },
           {
             title: this.$t('OperationTime'),
             dataIndex: 'createTime',
             align: 'center',
             width: '20%',
+            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/processForm/processDetails/index.vue b/jero-web/src/views/processCenter/processForm/processDetails/index.vue
index b249d372e..5c3d172af 100644
--- a/jero-web/src/views/processCenter/processForm/processDetails/index.vue
+++ b/jero-web/src/views/processCenter/processForm/processDetails/index.vue
@@ -13,7 +13,8 @@
     </div>
     <div class="action-bar">
     </div>
-    <regulatoryCirculationHistory v-if="$route.query.prcType == '5' || $route.query.prcType == '6'"/>
+    <regulatoryCirculationHistory :isTrue="isTrue"
+                                  v-if="$route.query.prcType == '5' || $route.query.prcType == '6'"/>
     <circulationHistory v-else/>
   </div>
 </template>
@@ -33,7 +34,8 @@
     },
     data() {
       return {
-        processStep: null
+        processStep: null,
+        isTrue: false
       }
     },
     created() {
@@ -41,6 +43,11 @@
     },
     mounted() {
       this.processNum()
+      if (this.$route.query.prcType == '6') {
+        this.isTrue = true
+      } else {
+        this.isTrue = false
+      }
     },
     methods: {
       back() {