From 12a82105346f1d39cab143bdb87ca40c2554b41e Mon Sep 17 00:00:00 2001
From: danshihao <danshihao@syxysoft.com>
Date: Wed, 22 Nov 2023 13:33:33 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E4=BC=81=E6=A0=87=E7=A8=BD=E6=9F=A5?=
 =?UTF-8?q?=E8=AE=A1=E5=88=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/InspectionPlanTable.vue                  |  1 +
 .../modules/ShowOpinionModal.vue                     | 12 +++++-------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/views/workCenter/enterpriseStandardInspectionPlan/modules/InspectionPlanTable.vue b/src/views/workCenter/enterpriseStandardInspectionPlan/modules/InspectionPlanTable.vue
index f242f632..5f8229c5 100644
--- a/src/views/workCenter/enterpriseStandardInspectionPlan/modules/InspectionPlanTable.vue
+++ b/src/views/workCenter/enterpriseStandardInspectionPlan/modules/InspectionPlanTable.vue
@@ -17,6 +17,7 @@
         :dataSource="dataSource"
         :can-drag="true"
         rowKey="id"
+        :loading="loading"
         :pagination="false"
         :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
         :scroll="{x: '100%'}"
diff --git a/src/views/workCenter/enterpriseStandardInspectionPlan/modules/ShowOpinionModal.vue b/src/views/workCenter/enterpriseStandardInspectionPlan/modules/ShowOpinionModal.vue
index 45e58968..d8706368 100644
--- a/src/views/workCenter/enterpriseStandardInspectionPlan/modules/ShowOpinionModal.vue
+++ b/src/views/workCenter/enterpriseStandardInspectionPlan/modules/ShowOpinionModal.vue
@@ -15,10 +15,8 @@
         :dataSource="dataSource"
         :can-drag="true"
         rowKey="id"
-        :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
-        :pagination="ipagination"
-        :scroll="{x: '100%'}"
-        @change="tableOnChange">
+        :pagination="false"
+        :scroll="{x: '100%'}">
       </j-table>
     </a-spin>
   </j-modal>
@@ -26,10 +24,8 @@
 
 <script>
 import JTable from '@comp/jero/JTable'
-import { JeroListMixin } from '@/mixins/JeroListMixin'
 export default {
   name: 'ShowOpinionModal',
-  mixins: [JeroListMixin],
   components: { JTable },
   data () {
     return {
@@ -47,7 +43,7 @@ export default {
           title: this.$t('workCenter.esInspectionPlan.solicitOpinionObject'),
           align: 'center',
           width: 180,
-          dataIndex: 'solicitOpinionObject',
+          dataIndex: 'createByDictText',
           scopedSlots: { customRender: 'text' }
         },
         { // 意见
@@ -64,6 +60,7 @@ export default {
     show (record) {
       this.model = Object.assign({}, record)
       this.visible = true
+      this.dataSource = record.processEsInspectPlanOpinionList || []
     },
     // 确定
     handleOk () {
@@ -75,6 +72,7 @@ export default {
     },
     close () {
       this.$emit('close')
+      this.dataSource = []
       this.visible = false
     },
     tableOnChange (pagination, filters, sorter) {