diff --git a/src/apis/modules/serverObj.js b/src/apis/modules/serverObj.js
index fb17698..032c143 100644
--- a/src/apis/modules/serverObj.js
+++ b/src/apis/modules/serverObj.js
@@ -23,3 +23,7 @@ export const createOrderItem=(params)=> request.basic.post('/api/v1/orders', par
export const inOutLogs=(params)=>request.basic.post('/api/v1/in-out-logs',params)
export const changeItem = (id, params) => request.basic.put(`/api/v1/customers/change/${id}`, params)
+
+
+// 待完善对象列表
+export const upDateArchives = (id, params) => request.basic.put(`/api/v1/archives/${id}`, params)
diff --git a/src/views/serverObj/toBeInstitution/components/EditDialog.vue b/src/views/serverObj/toBeInstitution/components/EditDialog.vue
index 33b0919..cad1d3b 100644
--- a/src/views/serverObj/toBeInstitution/components/EditDialog.vue
+++ b/src/views/serverObj/toBeInstitution/components/EditDialog.vue
@@ -1,79 +1,559 @@
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.introduction }}
+
+
+
+
+
+
+
+
+
+
+ {{ item.introduction }}
+
+
+
+
+
+
+
+
+
+ {{
+ item.introduction }}
+
+
+
+
+
+
+
+
+
+ {{ item.introduction }}
+
+
+
+
+
+
+
+
+
+
+ {{ item.introduction }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.introduction }}
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.introduction }}
+
+
+
+
+
+
+
+
+
+
+ {{ item.introduction }}
+
+
+
+
+
+
+
+
+
+
+ {{ item.introduction }}
+
+
+
+
+
+
+
+
+
+
+ {{ item.introduction }}
+
+
+
+
+
+
+
+
+
+
+ {{ item.introduction }}
+
+
+
+
+
+
+
+
+
+
+ {{ item.introduction }}
+
+
+
+
+
+
+
+
+
+
+ {{ item.introduction }}
+
+
+
+
+
+
+
+
+
+
+ {{ item.introduction }}
+
+
+
+
+
+
+
+
+
+
+ {{ item.introduction }}
+
+
+
+
+
+
+
+
+
+
+ {{ item.introduction }}
+
+
+
+
+
+
+
+
+
+
+ {{ item.introduction }}
+
+
+
+
+
+
+
+
+
+
+ {{ item.introduction }}
+
+
+
+
+
+
+
+
+
+
+ {{ item.introduction }}
+
+
+
+
+
+
+
+
+
+
+ {{ item.introduction }}
+
+
+
+
+
+
+
+
+
+
+ {{ item.introduction }}
+
+
+
+
+
+
+
+
+
+
+ {{ item.introduction }}
+
+
+
+
+
+
+
+ {{
+ item.introduction }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/serverObj/toBeInstitution/index.vue b/src/views/serverObj/toBeInstitution/index.vue
index 90fd961..0ea0cf8 100644
--- a/src/views/serverObj/toBeInstitution/index.vue
+++ b/src/views/serverObj/toBeInstitution/index.vue
@@ -46,9 +46,11 @@
-
+
+ {{ record.archive.homeAreaLabels.join('')}}
+
-
+
编辑
@@ -71,6 +73,7 @@ import EditDialog from './components/EditDialog.vue'
import { useDicsStore } from '@/store'
import AreaCascader from '@/components/AreaCascader/index.vue'
import dayjs from 'dayjs'
+import { status } from 'nprogress'
defineOptions({
name: 'allocation',
})
@@ -85,32 +88,32 @@ const columns = [
width: 100,
},
{
- title: '出生日期',
- dataIndex: 'birthTime',
- key: 'birthTime',
+ title: '身份证',
+ dataIndex: 'identityNo',
+ key: 'identityNo',
align: 'center',
- width: 80,
- },
- {
- title: '户籍责任区',
- dataIndex: 'age',
- key: 'age',
- align: 'center',
- width: 80,
+ width: 150,
},
+ // {
+ // title: '户籍责任区',
+ // dataIndex: 'age',
+ // key: 'age',
+ // align: 'center',
+ // width: 150,
+ // },
// --- 联系方式 ---
{
title: '联系方式',
- dataIndex: 'contact',
- key: 'contact',
+ dataIndex: 'contact1',
+ key: 'contact1',
align: 'center',
width: 130,
},
{
title: '户籍区域',
- dataIndex: 'contact2',
- key: 'contact2',
+ dataIndex: 'archiveLable',
+ key: 'archiveLable',
align: 'center',
width: 130,
},
@@ -203,6 +206,7 @@ async function getPageList() {
.getProjectList({
pageSize,
current: current,
+ status: 'perfect',
...searchFormData.value,
})
.catch(() => {
diff --git a/src/views/serviceMenu/serviceOrganization/components/EditDialog.vue b/src/views/serviceMenu/serviceOrganization/components/EditDialog.vue
index b742844..a00be3e 100644
--- a/src/views/serviceMenu/serviceOrganization/components/EditDialog.vue
+++ b/src/views/serviceMenu/serviceOrganization/components/EditDialog.vue
@@ -6,7 +6,7 @@
:confirm-loading="confirmLoading"
:after-close="onAfterClose"
:cancel-text="t('button.cancel')"
- :ok-text="mode === 'view' ? t('button.close') : mode === 'edit' ? '保存' : '新增'"
+ :ok-text="mode === 'view' ? '关闭' : mode === 'edit' ? '保存' : '新增'"
@ok="handleOk"
@cancel="handleCancel"
:maskClosable="false"