From b6bd32430b1663eb5e454c18ceaa941a85901078 Mon Sep 17 00:00:00 2001
From: qsh <>
Date: Mon, 24 Jun 2024 23:28:56 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Basic/GeneralSet/Comp/BSClue.vue  |  2 +-
 src/views/Clue/Order/Comp/MallOrderList.vue | 10 +++++++++-
 src/views/Clue/Order/Comp/OrderList.vue     | 10 +++++++++-
 src/views/Clue/Pool/index.vue               |  2 +-
 4 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/src/views/Basic/GeneralSet/Comp/BSClue.vue b/src/views/Basic/GeneralSet/Comp/BSClue.vue
index 8a2b1c5..7ca45c9 100644
--- a/src/views/Basic/GeneralSet/Comp/BSClue.vue
+++ b/src/views/Basic/GeneralSet/Comp/BSClue.vue
@@ -10,7 +10,7 @@
       </template>
       <el-radio-group
         v-model="form.usePhoneConfig"
-        :disabled="getConfig('usePhoneConfig').modifiable == 'false'"
+        :disabled="!getConfig('usePhoneConfig').modifiable"
       >
         <el-radio
           v-for="(item, index) in getConfig('usePhoneConfig').options"
diff --git a/src/views/Clue/Order/Comp/MallOrderList.vue b/src/views/Clue/Order/Comp/MallOrderList.vue
index 42a6e56..689bcc0 100644
--- a/src/views/Clue/Order/Comp/MallOrderList.vue
+++ b/src/views/Clue/Order/Comp/MallOrderList.vue
@@ -60,6 +60,7 @@
       v-model:tableObject="tableObject"
       :tableColumns="allSchemas.tableColumns"
       @get-list="getTableList"
+      @get-checked-columns="getCheckedColumns"
     >
       <el-table-column type="expand">
         <template #default="{ row }">
@@ -104,7 +105,7 @@
         </template>
       </el-table-column>
       <el-table-column
-        v-for="item in allSchemas.tableColumns"
+        v-for="item in showColumns"
         :key="item.field"
         :prop="item.field"
         :label="item.label"
@@ -282,6 +283,13 @@ async function getCurdSchemas() {
   }
 }
 
+const showColumns = ref([])
+
+// 初始化表格
+function getCheckedColumns(list) {
+  showColumns.value = list && list.length ? list : allSchemas.value.tableColumns
+}
+
 // 详情
 function handleDetail(row) {
   orderDetailDialog.value.open(row.clueId, row.signId)
diff --git a/src/views/Clue/Order/Comp/OrderList.vue b/src/views/Clue/Order/Comp/OrderList.vue
index c1d937e..35c5190 100644
--- a/src/views/Clue/Order/Comp/OrderList.vue
+++ b/src/views/Clue/Order/Comp/OrderList.vue
@@ -79,9 +79,10 @@
       v-model:tableObject="tableObject"
       :tableColumns="allSchemas.tableColumns"
       @get-list="getTableList"
+      @get-checked-columns="getCheckedColumns"
     >
       <el-table-column
-        v-for="item in allSchemas.tableColumns"
+        v-for="item in showColumns"
         :key="item.field"
         :prop="item.field"
         :label="item.label"
@@ -232,6 +233,13 @@ async function getCurdSchemas() {
   }
 }
 
+const showColumns = ref([])
+
+// 初始化表格
+function getCheckedColumns(list) {
+  showColumns.value = list && list.length ? list : allSchemas.value.tableColumns
+}
+
 // 详情
 function handleDetail(row) {
   orderDetailDialog.value.open(row.clueId, row.signId)
diff --git a/src/views/Clue/Pool/index.vue b/src/views/Clue/Pool/index.vue
index 58e3113..00887ae 100644
--- a/src/views/Clue/Pool/index.vue
+++ b/src/views/Clue/Pool/index.vue
@@ -214,7 +214,7 @@ const showColumns = ref([])
 
 // 初始化表格
 function getCheckedColumns(list) {
-  showColumns.value = list
+  showColumns.value = list && list.length ? list : allSchemas.value.tableColumns
 }
 
 function resetQuery() {