@@ -147,8 +147,9 @@ const show = () => {
getList()
};
const handleChange = (data, checked) => {
+ console.log('data, checked',data, checked)
// 左侧有选择框
- if (props.showCheckbox) {
+ // if (props.showCheckbox) {
// 左侧有选择框 + 多选
if (props.multiple) {
//不添加重复的数据到右边
@@ -159,9 +160,9 @@ const handleChange = (data, checked) => {
}
}
if (checked) {
- if (data.children === undefined) {
+ // if (data.children === undefined) {
selectList.value.push(data);
- }
+ // }
} else if (data === "1") {
tree.value.setCheckedKeys([]);
selectList.value = [];
@@ -183,7 +184,7 @@ const handleChange = (data, checked) => {
tree.value.setCheckedKeys([]);
}
}
- }
+ // }
};
const handle = (node, check) => {
if (check.isLeaf !== false) {
diff --git a/src/views/expense-management/share/index.vue b/src/views/expense-management/share/index.vue
index ddfc361..66d9728 100644
--- a/src/views/expense-management/share/index.vue
+++ b/src/views/expense-management/share/index.vue
@@ -31,6 +31,8 @@ const searchConfig = reactive([
props: {
placeholder: '请选择分摊月份',
clearable: true,
+ type:'month',
+ valueFormat:"YYYY-MM-DD HH:mm:ss"
},
colProps: {}
},
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index fd09c91..e6b3e5e 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -53,6 +53,15 @@ const searchConfig = ref([
clearable: true
}
},
+ {
+ label: '用户昵称',
+ prop: 'nickName',
+ component: 'el-input',
+ props: {
+ placeholder: '请输入',
+ clearable: true
+ }
+ },
{
label: '状态',
prop: 'state',