From e5c80121d89d0511413b0ea493fae2a4e5eba4bb Mon Sep 17 00:00:00 2001 From: caoqianming Date: Fri, 19 Dec 2025 15:25:37 +0800 Subject: [PATCH 1/3] =?UTF-8?q?feat:=20base=20xtSelect=20change=E6=97=B6?= =?UTF-8?q?=E6=8A=9B=E5=87=BA=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/xtSelect/index.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/xtSelect/index.vue b/src/components/xtSelect/index.vue index a6924eb9..902d2a23 100644 --- a/src/components/xtSelect/index.vue +++ b/src/components/xtSelect/index.vue @@ -190,7 +190,7 @@ const rowClick = (row) => { selectValue.value = row[props.valueField]; showPopover.value = false; } - emit("change"); + emit("change", selectObj.value); }; const handleClear = () => { @@ -203,7 +203,7 @@ const handleClear = () => { selectValue.value = null; } emit("update:label", ""); - emit("change"); + emit("change", selectObj.value); }; const tdChange = (res, tableData) => { @@ -221,6 +221,6 @@ const selectionChange = (val) => { .join(props.splitField); } emit("update:label", val); - emit("change"); + emit("change", selectObj.value); }; From 9806e264d80320f98738d25079b2223a49547b3e Mon Sep 17 00:00:00 2001 From: caoqianming Date: Fri, 19 Dec 2025 15:46:31 +0800 Subject: [PATCH 2/3] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96xtselect?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/xtSelect/index.vue | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/components/xtSelect/index.vue b/src/components/xtSelect/index.vue index 902d2a23..94c622a5 100644 --- a/src/components/xtSelect/index.vue +++ b/src/components/xtSelect/index.vue @@ -89,7 +89,7 @@ const props = defineProps({ options: { type: Array, default: null }, }); -const emit = defineEmits(["update:modelValue", "update:obj", "update:label", "change"]); +const emit = defineEmits(["update:modelValue", "update:obj", "change"]); const selectable = (row) => row.count_canhandover?row.count_canhandover>0:true; // 控制 popover 显示与隐藏的状态 const showPopover = ref(false); @@ -189,8 +189,8 @@ const rowClick = (row) => { selectLabel.value = row[props.labelField]; selectValue.value = row[props.valueField]; showPopover.value = false; + emit("change", row); } - emit("change", selectObj.value); }; const handleClear = () => { @@ -202,8 +202,7 @@ const handleClear = () => { selectLabel.value = ""; selectValue.value = null; } - emit("update:label", ""); - emit("change", selectObj.value); + emit("change", props.multiple ? [] : null); }; const tdChange = (res, tableData) => { @@ -219,8 +218,7 @@ const selectionChange = (val) => { selectLabel.value = val .map((item) => item[props.labelField]) .join(props.splitField); - } - emit("update:label", val); - emit("change", selectObj.value); + emit("change", val); + } }; From da665b164f7ee33066ba070db87804e56032c003 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Fri, 19 Dec 2025 15:47:57 +0800 Subject: [PATCH 3/3] =?UTF-8?q?feat:=20=E7=A6=BB=E8=81=8C=E7=94=B3?= =?UTF-8?q?=E8=AF=B7=E5=8F=AF=E4=BB=A5=E9=80=89=E6=8B=A9=E4=BB=BB=E4=BD=95?= =?UTF-8?q?=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/hrm/resignation_form.vue | 31 ++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/src/views/hrm/resignation_form.vue b/src/views/hrm/resignation_form.vue index 2f022b1b..b305a6e1 100644 --- a/src/views/hrm/resignation_form.vue +++ b/src/views/hrm/resignation_form.vue @@ -3,7 +3,17 @@ - {{ formData.employee_name }}({{ formData.belong_dept_name }} - {{ formData.post_name }}) + + + + +