diff --git a/src/api/credit/creditJudgmentDebtor/model/index.ts b/src/api/credit/creditJudgmentDebtor/model/index.ts index 509d2ee..645cbf2 100644 --- a/src/api/credit/creditJudgmentDebtor/model/index.ts +++ b/src/api/credit/creditJudgmentDebtor/model/index.ts @@ -40,6 +40,9 @@ export interface CreditJudgmentDebtor { createTime?: string; // 修改时间 updateTime?: string; + // 历史ID + historyId?: number; + } /** diff --git a/src/api/credit/creditJudgmentDebtorHistory/index.ts b/src/api/credit/creditJudgmentDebtorHistory/index.ts index 8c7e2f9..3a2690c 100644 --- a/src/api/credit/creditJudgmentDebtorHistory/index.ts +++ b/src/api/credit/creditJudgmentDebtorHistory/index.ts @@ -103,3 +103,30 @@ export async function getCreditJudgmentDebtorHistory(id: number) { } return Promise.reject(new Error(res.data.message)); } + +/** + * 导入历史被执行人 + */ +export async function importCreditJudgmentDebtorHistory( + file: File, + companyId?: number +) { + const formData = new FormData(); + formData.append('file', file); + if (companyId != null) { + formData.append('companyId', String(companyId)); + } + const res = await request.post>( + '/credit/credit-judgment-debtor-history/import', + formData, + { + headers: { + 'Content-Type': 'multipart/form-data' + } + } + ); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} diff --git a/src/views/credit/creditJudgmentDebtor/components/credit-judgment-debtor-history-import.vue b/src/views/credit/creditJudgmentDebtor/components/credit-judgment-debtor-history-import.vue new file mode 100644 index 0000000..23a9791 --- /dev/null +++ b/src/views/credit/creditJudgmentDebtor/components/credit-judgment-debtor-history-import.vue @@ -0,0 +1,96 @@ + + + + + diff --git a/src/views/credit/creditJudgmentDebtor/components/creditJudgmentDebtorEdit.vue b/src/views/credit/creditJudgmentDebtor/components/creditJudgmentDebtorEdit.vue index 64713bb..de10d4b 100644 --- a/src/views/credit/creditJudgmentDebtor/components/creditJudgmentDebtorEdit.vue +++ b/src/views/credit/creditJudgmentDebtor/components/creditJudgmentDebtorEdit.vue @@ -8,13 +8,14 @@ :title="isUpdate ? '编辑被执行人' : '添加被执行人'" :body-style="{ paddingBottom: '28px' }" @update:visible="updateVisible" + :footer="null" @ok="save" > - - - - - - - - - - - - 显示 - 隐藏 - - - - - - - - - - - + + + + + + + + @@ -174,18 +132,14 @@ dataStatus: undefined, comments: undefined, recommend: undefined, - sortNumber: undefined, - status: undefined, deleted: undefined, userId: undefined, tenantId: undefined, createTime: undefined, updateTime: undefined, - creditJudgmentDebtorId: undefined, - creditJudgmentDebtorName: '', status: 0, - comments: '', - sortNumber: 100 + sortNumber: 100, + historyId: undefined }); /* 更新visible */ diff --git a/src/views/credit/creditJudgmentDebtor/index.vue b/src/views/credit/creditJudgmentDebtor/index.vue index d0f69a9..78e93bc 100644 --- a/src/views/credit/creditJudgmentDebtor/index.vue +++ b/src/views/credit/creditJudgmentDebtor/index.vue @@ -33,6 +33,14 @@ + + @@ -87,7 +109,9 @@ import { exportCreditData } from '../utils/export'; import { getPageTitle } from '@/utils/common'; import CreditJudgmentDebtorEdit from './components/creditJudgmentDebtorEdit.vue'; + import CreditJudgmentDebtorHistoryEdit from '@/views/credit/creditJudgmentDebtorHistory/components/creditJudgmentDebtorHistoryEdit.vue'; import CreditJudgmentDebtorImport from './components/credit-judgment-debtor-import.vue'; + import CreditJudgmentDebtorHistoryImport from './components/credit-judgment-debtor-history-import.vue'; import { pageCreditJudgmentDebtor, listCreditJudgmentDebtor, @@ -108,8 +132,12 @@ const current = ref(null); // 是否显示编辑弹窗 const showEdit = ref(false); + // 是否显示编辑弹窗2 + const showEdit2 = ref(false); // 是否显示导入弹窗 const showImport = ref(false); + // 是否显示历史被执行人导入弹窗 + const showImport2 = ref(false); // 是否显示批量移动弹窗 const showMove = ref(false); // 加载状态 @@ -184,12 +212,14 @@ key: 'courtName', ellipsis: true }, - // { - // title: '数据状态', - // dataIndex: 'dataStatus', - // key: 'dataStatus', - // ellipsis: true - // }, + { + title: '状态', + dataIndex: 'dataStatus', + key: 'dataStatus', + ellipsis: true, + align: 'center', + width: 90 + }, { title: '创建时间', dataIndex: 'createTime', @@ -235,6 +265,17 @@ showImport.value = true; }; + /* 打开历史被执行人导入弹窗 */ + const openImport2 = () => { + showImport2.value = true; + }; + + /* 打开编辑弹窗 */ + const openEdit2 = (row?: CreditJudgmentDebtor) => { + current.value = row ?? null; + showEdit2.value = true; + }; + /* 导出 */ const exportData = () => { exportCreditData({ @@ -320,7 +361,12 @@ }, // 行双击事件 onDblclick: () => { - openEdit(record); + if(!record.historyId){ + openEdit(record); + }else { + openEdit2(record); + } + } }; }; diff --git a/src/views/credit/creditJudgmentDebtorHistory/components/creditJudgmentDebtorHistoryEdit.vue b/src/views/credit/creditJudgmentDebtorHistory/components/creditJudgmentDebtorHistoryEdit.vue index 4cb32cc..57aaeec 100644 --- a/src/views/credit/creditJudgmentDebtorHistory/components/creditJudgmentDebtorHistoryEdit.vue +++ b/src/views/credit/creditJudgmentDebtorHistory/components/creditJudgmentDebtorHistoryEdit.vue @@ -5,16 +5,17 @@ :visible="visible" :maskClosable="false" :maxable="maxable" - :title="isUpdate ? '编辑被执行人' : '添加被执行人'" + :title="isUpdate ? '历史被执行人' : '历史被执行人'" :body-style="{ paddingBottom: '28px' }" @update:visible="updateVisible" + :footer="null" @ok="save" > - - - + + + + + + + - - - - - - - - - - - - - - - - - - - - - 显示 - 隐藏 - - - - - - - - - - - + + + + + + + +