From b8d8b852662c4587ef2d1de62ff024e5597e2c85 Mon Sep 17 00:00:00 2001
From: qiuyuan <qiuyuan@yonyou.com>
Date: Thu, 6 Nov 2025 10:18:49 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../allocation/components/EditDialog.vue      | 207 +++++++++---------
 1 file changed, 103 insertions(+), 104 deletions(-)

diff --git a/src/views/serverObj/allocation/components/EditDialog.vue b/src/views/serverObj/allocation/components/EditDialog.vue
index 33b0919..5d7e982 100644
--- a/src/views/serverObj/allocation/components/EditDialog.vue
+++ b/src/views/serverObj/allocation/components/EditDialog.vue
@@ -1,136 +1,135 @@
 <template>
-    <a-modal :open="modal.open" :title="modal.title" :width="600" :confirm-loading="modal.confirmLoading"
-        :after-close="onAfterClose" :cancel-text="cancelText" @ok="handleOk" @cancel="handleCancel">
-        <a-form ref="formRef" :model="formData" :rules="formRules">
-            <a-row :gutter="24">
-                <!-- 姓名 -->
-                <a-col :span="24">
-                    <a-form-item label="分配到" name="name" :rules="[{ required: true, message: '请选择节点' }]">
-                        <a-tree-select v-model:value="formData.name" style="width: 100%" :tree-data="treeData" tree-checkable
-                            allow-clear :show-checked-strategy="SHOW_PARENT" placeholder="请选择站点"
-                            tree-node-filter-prop="label" />
-                    </a-form-item>
-                </a-col>
-            </a-row>
-        </a-form>
-    </a-modal>
+  <a-modal
+    :open="modal.open"
+    :title="modal.title"
+    :width="600"
+    :confirm-loading="modal.confirmLoading"
+    :after-close="onAfterClose"
+    :cancel-text="cancelText"
+    @ok="handleOk"
+    @cancel="handleCancel"
+  >
+    <a-form ref="formRef" :model="formData" :rules="formRules">
+      <a-row :gutter="24">
+        <!-- 分配到 -->
+        <a-col :span="24">
+          <a-form-item
+            label="分配到"
+            name="name"
+            :rules="[{ required: true, message: '请选择节点' }]"
+          >
+            <a-select
+              v-model:value="formData.name"
+              style="width: 100%"
+              :options="options"
+              placeholder="请选择站点"
+              allow-clear
+            />
+          </a-form-item>
+        </a-col>
+      </a-row>
+    </a-form>
+  </a-modal>
 </template>
 
 <script setup>
-import { cloneDeep } from 'lodash-es'
-import { ref, defineProps } from 'vue'
+import { ref } from 'vue'
 import { config } from '@/config'
 import apis from '@/apis'
-import { useForm, useModal } from '@/hooks'
-import { useDicsStore } from '@/store'
-import AreaCascader from '@/components/AreaCascader/index.vue'
-const emit = defineEmits(['ok'])
-const activeKey = ref('1')
-const { modal, showModal, hideModal, showLoading, hideLoading } = useModal()
-const { formRecord, formData, formRef, formRules, resetForm } = useForm()
-const cancelText = ref('取消')
-const treeData = [
-  {
-    label: 'Node1',
-    value: '0-0',
-    children: [
-      {
-        label: 'Child Node1',
-        value: '0-0-0',
-      },
-    ],
-  },
-  {
-    label: 'Node2',
-    value: '0-1',
+import { useForm, useModal,usePagination } from '@/hooks'
 
-    children: [
-      {
-        label: 'Child Node3',
-        value: '0-1-0',
-        disabled: true,
-      },
-      {
-        label: 'Child Node4',
-        value: '0-1-1',
-      },
-      {
-        label: 'Child Node5',
-        value: '0-1-2',
-      },
-    ],
-  },
-];
+
+const emit = defineEmits(['ok'])
+
+const { modal, showModal, hideModal, showLoading, hideLoading } = useModal()
+const { listData, loading, paginationState, resetPagination, searchFormData } = usePagination()
+const { formData, formRef, resetForm } = useForm()
+
+const cancelText = ref('取消')
+
+// 普通下拉选项（value + label）
+const options = ref([]);
+const currentRecord = ref(null)
 
 /**
- * 新建
+ * 新建（暴露给父组件调用）
  */
-function handleCreate() {
-    showModal({
-        type: 'create',
-        title: '分配节点',
-    })
+function handleCreate(record) {
+  currentRecord.value = record // 👈 保存传入的行数据
+  showModal({
+    type: 'create',
+    title: '分配节点',
+  })
+  getData() // 可选：每次打开都重新加载站点列表
 }
 
-
-
+getData()
+async function getData() {
+    try {
+        const { data, success } = await apis.serviceMenu.getServiceSiteList({
+            pageSize: 999,
+            current: 1
+        })
+        if (success) {
+            options.value = data.map(item => ({ value: item.id, label: item.name }))
+        }
+    } catch (error) {
+        console.error('获取服务站点列表失败:', error)
+    }
+}
 /**
  * 确定
  */
-function handleOk() {
-    formRef.value
-        .validateFields()
-        .then(async (values) => {
-            try {
-                showLoading()
-                const params = {
-                    ...formData.value,
-                }
-                let result = null
-                switch (modal.value.type) {
-                    case 'create':
-                        result = await apis.serverObj.createItem(params).catch(() => {
-                            throw new Error()
-                        })
-                        break
-                    case 'edit':
-                        result = await apis.serverObj.updateItem(params).catch(() => {
-                            throw new Error()
-                        })
-                        break
-                }
-                hideLoading()
-                if (config('http.code.success') === result?.code) {
-                    hideModal()
-                    emit('ok')
-                }
-            } catch (error) {
-                hideLoading()
-            }
-        })
-        .catch(() => {
-            hideLoading()
-        })
+async function handleOk() {
+    console.log("formData",modal.value.type)
+  try {
+    await formRef.value.validateFields()
+    showLoading()
+
+    const params = { ...formData.value }
+
+    let result
+    if (modal.value.type === 'create') {
+                console.log("====",params)
+      result = await apis.serverObj.changeItem(currentRecord.value?.id,{stationId:formData.value.name})
+      if (result.success) {
+        emit('ok')
+        hideModal()
+      }
+    } else if (modal.value.type === 'edit') {
+        console.log("====",params)
+    result = await apis.serverObj.updateItem(params)
+    }
+
+    hideLoading()
+
+    if (config('http.code.success') === result?.code) {
+      hideModal()
+      emit('ok')
+    }
+  } catch (error) {
+    hideLoading()
+  }
 }
 
 /**
  * 取消
  */
 function handleCancel() {
-    hideModal()
+  hideModal()
 }
 
 /**
- * 关闭后
+ * 关闭后重置表单
  */
 function onAfterClose() {
-    resetForm()
-    hideLoading()
+  resetForm()
 }
 
+// 暴露方法给父组件
 defineExpose({
-    handleCreate,
+  handleCreate,
 })
 </script>
 
-<style lang="less" scoped></style>
+<style lang="less" scoped></style>
\ No newline at end of file

From b8775ed9fc4f6b8e41a3c0998adf0fd8f6aba439 Mon Sep 17 00:00:00 2001
From: qiuyuan <qiuyuan@yonyou.com>
Date: Thu, 6 Nov 2025 10:57:13 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E7=94=9F=E5=AD=98=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/serverObj/existence/index.vue | 28 ++++++++++++++++++++++---
 1 file changed, 25 insertions(+), 3 deletions(-)

diff --git a/src/views/serverObj/existence/index.vue b/src/views/serverObj/existence/index.vue
index ad6c902..1e041f0 100644
--- a/src/views/serverObj/existence/index.vue
+++ b/src/views/serverObj/existence/index.vue
@@ -51,7 +51,7 @@
     </x-search-bar>
     <a-row :gutter="8" :wrap="false">
         <a-col flex="auto">
-            <a-card title="待分配对象列表">
+            <a-card title="生存状态列表">
                 <template #extra>
                     <a-space>
                         <a-button type="primary">导入</a-button>
@@ -66,6 +66,18 @@
                         <template v-if="column.key === 'serialNumber'">
                             <span>{{ index + 1 }}</span>
                         </template>
+
+                        <template v-if="column.key === 'livingStatus'">
+                            <span>{{ record.livingStatus.passWayAt == null ? '在世' : '已去世' }}</span>
+                        </template>
+
+                        <template v-if="column.key === 'diedTime'">
+                            <span>{{ record.livingStatus.passWayAt == null ? '--' : dayjs(record.livingStatus.passWayAt).format('YYYY-MM-DD') }}</span>
+                        </template>
+
+                        <template v-if="column.key === 'diedReason'">
+                            <span>{{ record.livingStatus.passWayReason != '' ? record.livingStatus.passWayReason : '--' }}</span>
+                        </template>
                       
                     </template>
                 </a-table>
@@ -123,11 +135,18 @@ const columns = [
     },
     {
         title: '身份证号',
-        dataIndex: 'idNumber',
-        key: 'idNumber',
+        dataIndex: 'identityNo',
+        key: 'identityNo',
         align: 'center',
         width: 180,
     },
+    {
+        title: '是否在世',
+        dataIndex: 'livingStatus',
+        key: 'livingStatus',
+        align: 'center',
+        width: 150,
+    },
 
     {
         title: '去世时间',
@@ -149,6 +168,9 @@ const columns = [
         key: 'updateTime',
         align: 'center',
         width: 120,
+        customRender: ({ text, record }) => {
+            return text ? dayjs(text).format('YYYY-MM-DD') : '-';
+        },
     },
 
     // --- 联系方式 ---