Merge remote-tracking branch 'origin/main' into dev

src/views/workplace/case/index.vue

@@ -12,6 +12,7 @@
       </el-tabs>
       <ProTable
         :config="config"
+        v-if="tableTrue"
         ref="caseLRef"
         :api="getCreditPage"
         :paramCallback="paramCallback"
@@ -87,7 +88,7 @@
 
 <script setup name="case-manage" lang="jsx">
   import { useRouter } from 'vue-router';
-  import { reactive, ref } from 'vue';
+  import { computed, reactive, ref, nextTick } from 'vue';
   import { getCreditPage, getCreditTotal } from '@/api/property';
   import { ElMessageBox, ElMessage } from 'element-plus';
   const caseLRef = ref();
@@ -123,6 +124,7 @@
   const activeName = ref('全部');
 
   const selectdList = ref([]);
+  const tableTrue = ref(true);
   const curParam = ref({});
   const statisis = ref({});
   const dataValue = ref('对查询结果操作');
@@ -219,7 +221,8 @@
     });
     query();
   };
-  const config = reactive({
+  const config = computed( () => {
+    return {
       columns: [
         { type: 'checkbox', title: '', width: 60, fixed: 'left' },
         {
@@ -379,9 +382,8 @@
           showOverflow: 'tooltip',
           title: '是否有跟进记录',
           width: 80,
-        visible: false,
           enum: BooleanStatus,
-        search: { el: 'select', props: { filterable: true,clearable: true }, labelWidth: 90, defaultValue: 'N' },
+          search: { el: 'select', props: { filterable: true,clearable: true }, labelWidth: 90, defaultValue: activeName.value === '全部' ? 'N' : 'Y' },
           fieldNames: { label: 'label', value: 'value' },
           slots: {
             default: ({ row }) => {
@@ -677,11 +679,13 @@
       ],
       onCheckboxChange: onCheckboxChange,
       onCheckboxAll: onCheckboxAll,
+    }
   });
 
   const query = () => caseLRef.value?.search();
   const handleClick = () => {
-    console.log('activeName', activeName.value);
+    tableTrue.value = false
+    nextTick(() => {tableTrue.value = true})
     setTimeout(() => {
         query();
     }, 300);