From dcb3da93c719f74f0a1d4486560b86dd39968be5 Mon Sep 17 00:00:00 2001
From: "zyx.net" <zyx>
Date: Mon, 26 Dec 2022 10:37:47 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=82=E6=95=B0=E6=94=B6=E9=9B=86=E6=B8=85?=
 =?UTF-8?q?=E5=8D=95=20=E5=A2=9E=E5=8A=A0=E5=8E=86=E5=8F=B2=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/tableCollection/index.vue  | 111 +++++++++++++++++-
 1 file changed, 109 insertions(+), 2 deletions(-)

diff --git a/jero-web/src/components/tableCollection/index.vue b/jero-web/src/components/tableCollection/index.vue
index e1878636e..1e582410e 100644
--- a/jero-web/src/components/tableCollection/index.vue
+++ b/jero-web/src/components/tableCollection/index.vue
@@ -33,7 +33,10 @@
 
           <a-button @click='onClickTitle(record)'>{{$t('See')}}</a-button>
         </span>
-
+        <!--        历史记录-->
+        <template slot="Operation" slot-scope="text, record">
+          <a-button class="action-dict" @click="UpdateLog(record)">{{$t('historicalrecord')}}</a-button>
+        </template>
         <span slot="paramsNameDescription" slot-scope="text,record" :title="text">
           {{ text && text.length > 8 ? text.slice(0, 7) + '...' : text }}
         </span>
@@ -166,6 +169,51 @@
         </div>
       </div>
     </a-modal>
+    <!--    历史记录-->
+    <a-modal
+      :title="$t('historicalrecord')"
+      :width="900"
+      :visible="visible"
+      :confirm-loading="confirmLoading"
+      :maskClosable="false"
+      @ok="handleOk"
+      @cancel="handleCancel"
+    >
+      <a-table
+        class="table"
+        :columns="columnshistory"
+        :pagination="false"
+        :scroll="{y: 400}"
+        :data-source="dataSourcehistory"
+        :loading="loading"
+      >
+       <span slot="content" slot-scope="text,record">
+          <a-tooltip placement="topLeft">
+        <template slot="title">
+          <span v-html="text"></span>
+        </template>
+            <span v-html="text"></span>
+      </a-tooltip>
+       </span>
+        <span slot="detailText" slot-scope="text,record">
+              <span class="text" :title="text">
+               {{text && text.length > 10?text.slice(0,9)+'...':text}}
+              </span>
+        </span>
+      </a-table>
+      <div class="page" v-if="dataSourcehistory.length > 0">
+        <a-pagination
+          :show-total="total => $t('total')+` ${total} `+$t('strip')"
+          show-quick-jumper
+          show-size-changer
+          :page-size.sync="pageSizehistory"
+          :total="total"
+          :current="pageNohistory"
+          @change="onChangehistory"
+          @showSizeChange="SizeChangehistory"
+        />
+      </div>
+    </a-modal>
     <!--  配置信息--->
     <a-modal v-model="areaVisibleView" :title="$t('configurationInformation')" width='550px' :footer="null">
       <div class="content-text">
@@ -354,7 +402,33 @@
         getquerySdtId: '', // 当前工程接口人的id
         areaVisibleView: false, // 查看配置得弹框
         seeVisibleView: false,
-        configDetail: {} // 查看配置得详细信息
+        visible: false,
+        configDetail: {}, // 查看配置得详细信息
+        dataSourcehistory:[],
+        columnshistory: [
+          {
+            title: this.$t('OperationDetails'),
+            dataIndex: 'logContent',
+            align: 'center',
+            ellipsis: true,
+            scopedSlots: { customRender: 'content' }
+          },
+          {
+            title: this.$t('remarks'),
+            dataIndex: 'remarks',
+            align: 'center',
+            ellipsis: true,
+            width: 180,
+            scopedSlots: { customRender: 'detailText' }
+          },
+          {
+            title: this.$t('OperationTime'),
+            dataIndex: 'createTime',
+            align: 'center',
+            ellipsis: true,
+            width: 180
+          }
+        ]
       }
     },
     mounted() {
@@ -599,6 +673,34 @@
           }
         })
       },
+      UpdateLog(val) {
+        this.visible = true
+        this.paramsReportDetailId = val.id
+        this.bussLogList(val)
+      },
+      bussLogList(val) {
+        let query = {
+          pageNo: this.pageNohistory,
+          pageSize: this.pageSizehistory,
+          paramsReportDetailId: this.paramsReportDetailId
+        }
+        this.loading = true
+        getAction('report/detailLog/page', query).then((res) => {
+          if (res.success) {
+            this.dataSourcehistory = res.result.records
+            this.total = res.result.total
+            this.loading = false
+          } else {
+            this.loading = false
+          }
+        })
+      },
+      handleOk() {
+        this.visible = false
+      },
+      handleCancel() {
+        this.visible = false
+      },
       getAndUserId(result) {
         let query = {
           paramsManifestId: this.$route.query.id,
@@ -699,6 +801,11 @@
                     customRender: 'paramsNameDescription'
                   }
                 }
+                if (res.click4) {
+                  this.columns[index].scopedSlots = {
+                    customRender: 'Operation'
+                  }
+                }
                 if (res.click) {
                   // 工程接口人列表修改
                   this.columns[index].scopedSlots = {