Commit 499042e9 authored by tanghao's avatar tanghao

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

parents 1269063e d6e0ea19
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
</el-tabs> </el-tabs>
<ProTable <ProTable
:config="config" :config="config"
v-if="tableTrue"
ref="caseLRef" ref="caseLRef"
:api="getCreditPage" :api="getCreditPage"
:paramCallback="paramCallback" :paramCallback="paramCallback"
...@@ -87,7 +88,7 @@ ...@@ -87,7 +88,7 @@
<script setup name="case-manage" lang="jsx"> <script setup name="case-manage" lang="jsx">
import { useRouter } from 'vue-router'; import { useRouter } from 'vue-router';
import { reactive, ref } from 'vue'; import { computed, reactive, ref, nextTick } from 'vue';
import { getCreditPage, getCreditTotal } from '@/api/property'; import { getCreditPage, getCreditTotal } from '@/api/property';
import { ElMessageBox, ElMessage } from 'element-plus'; import { ElMessageBox, ElMessage } from 'element-plus';
const caseLRef = ref(); const caseLRef = ref();
...@@ -123,6 +124,7 @@ ...@@ -123,6 +124,7 @@
const activeName = ref('全部'); const activeName = ref('全部');
const selectdList = ref([]); const selectdList = ref([]);
const tableTrue = ref(true);
const curParam = ref({}); const curParam = ref({});
const statisis = ref({}); const statisis = ref({});
const dataValue = ref('对查询结果操作'); const dataValue = ref('对查询结果操作');
...@@ -219,7 +221,8 @@ ...@@ -219,7 +221,8 @@
}); });
query(); query();
}; };
const config = reactive({ const config = computed( () => {
return {
columns: [ columns: [
{ type: 'checkbox', title: '', width: 60, fixed: 'left' }, { type: 'checkbox', title: '', width: 60, fixed: 'left' },
{ {
...@@ -379,9 +382,8 @@ ...@@ -379,9 +382,8 @@
showOverflow: 'tooltip', showOverflow: 'tooltip',
title: '是否有跟进记录', title: '是否有跟进记录',
width: 80, width: 80,
visible: false,
enum: BooleanStatus, 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' }, fieldNames: { label: 'label', value: 'value' },
slots: { slots: {
default: ({ row }) => { default: ({ row }) => {
...@@ -677,11 +679,13 @@ ...@@ -677,11 +679,13 @@
], ],
onCheckboxChange: onCheckboxChange, onCheckboxChange: onCheckboxChange,
onCheckboxAll: onCheckboxAll, onCheckboxAll: onCheckboxAll,
}
}); });
const query = () => caseLRef.value?.search(); const query = () => caseLRef.value?.search();
const handleClick = () => { const handleClick = () => {
console.log('activeName', activeName.value); tableTrue.value = false
nextTick(() => {tableTrue.value = true})
setTimeout(() => { setTimeout(() => {
query(); query();
}, 300); }, 300);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment