diff --git a/src/api/law/lawLegalMediate/index.ts b/src/api/law/lawLegalMediate/index.ts new file mode 100644 index 0000000..0e42b8e --- /dev/null +++ b/src/api/law/lawLegalMediate/index.ts @@ -0,0 +1,106 @@ +import request from '@/utils/request'; +import type { ApiResult, PageResult } from '@/api'; +import type { LawLegalMediate, LawLegalMediateParam } from './model'; +import { MODULES_API_URL } from '@/config/setting'; + +/** + * 分页查询调解申请 + */ +export async function pageLawLegalMediate(params: LawLegalMediateParam) { + const res = await request.get>>( + MODULES_API_URL + '/law/law-legal-mediate/page', + { + params + } + ); + if (res.data.code === 0) { + return res.data.data; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 查询调解申请列表 + */ +export async function listLawLegalMediate(params?: LawLegalMediateParam) { + const res = await request.get>( + MODULES_API_URL + '/law/law-legal-mediate', + { + params + } + ); + if (res.data.code === 0 && res.data.data) { + return res.data.data; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 添加调解申请 + */ +export async function addLawLegalMediate(data: LawLegalMediate) { + const res = await request.post>( + MODULES_API_URL + '/law/law-legal-mediate', + data + ); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 修改调解申请 + */ +export async function updateLawLegalMediate(data: LawLegalMediate) { + const res = await request.put>( + MODULES_API_URL + '/law/law-legal-mediate', + data + ); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 删除调解申请 + */ +export async function removeLawLegalMediate(id?: number) { + const res = await request.delete>( + MODULES_API_URL + '/law/law-legal-mediate/' + id + ); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 批量删除调解申请 + */ +export async function removeBatchLawLegalMediate(data: (number | undefined)[]) { + const res = await request.delete>( + MODULES_API_URL + '/law/law-legal-mediate/batch', + { + data + } + ); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 根据id查询调解申请 + */ +export async function getLawLegalMediate(id: number) { + const res = await request.get>( + MODULES_API_URL + '/law/law-legal-mediate/' + id + ); + if (res.data.code === 0 && res.data.data) { + return res.data.data; + } + return Promise.reject(new Error(res.data.message)); +} diff --git a/src/api/law/lawLegalMediate/model/index.ts b/src/api/law/lawLegalMediate/model/index.ts new file mode 100644 index 0000000..e39ca6e --- /dev/null +++ b/src/api/law/lawLegalMediate/model/index.ts @@ -0,0 +1,75 @@ +import type { PageParam } from '@/api'; + +/** + * 调解申请 + */ +export interface LawLegalMediate { + // + id?: number; + // + userId?: number; + // + name?: string; + // + gender?: number; + // + age?: number; + // + phone?: string; + // + birthday?: string; + // + idCard?: string; + // 住所地址 + liveAddress?: string; + // 户籍地址 + householdAddress?: string; + // 说明 + content?: string; + // 申请事项 + requestContent?: string; + // 是否删除, 0否, 1是 + deleted?: number; + // 租户id + tenantId?: number; + // 创建时间 + createTime?: string; + // 修改时间 + updateTime?: string; + // + nation?: string; + // 工作单位 + companyName?: string; + // + email?: string; + // 代理人姓名 + proxyName?: string; + // 代理人联系电话 + proxyPhone?: string; + // 关系 + proxyRelation?: string; + // 代理人身份证 + proxyIdCard?: string; + // 被申请人 + respondent?: string; + // 被申请人身份证 + respondentIdCard?: string; + // 被申请人性别 + respondentGender?: number; + // 被申请人年龄 + respondentAge?: number; + // 被申请人民族 + respondentNation?: string; + // 被申请人职位 + respondentPosition?: string; + // 被申请人地址 + respondentAddress?: string; +} + +/** + * 调解申请搜索条件 + */ +export interface LawLegalMediateParam extends PageParam { + id?: number; + keywords?: string; +} diff --git a/src/api/law/lawLegalReview/index.ts b/src/api/law/lawLegalReview/index.ts new file mode 100644 index 0000000..e5eb302 --- /dev/null +++ b/src/api/law/lawLegalReview/index.ts @@ -0,0 +1,116 @@ +import request from '@/utils/request'; +import type { ApiResult, PageResult } from '@/api'; +import type { LawLegalReview, LawLegalReviewParam } from './model'; +import { MODULES_API_URL } from '@/config/setting'; + +/** + * 分页查询行政复议申请 + */ +export async function pageLawLegalReview(params: LawLegalReviewParam) { + const res = await request.get>>( + MODULES_API_URL + '/law/law-legal-review/page', + { + params + } + ); + if (res.data.code === 0) { + return res.data.data; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 查询行政复议申请列表 + */ +export async function listLawLegalReview(params?: LawLegalReviewParam) { + const res = await request.get>( + MODULES_API_URL + '/law/law-legal-review', + { + params + } + ); + if (res.data.code === 0 && res.data.data) { + return res.data.data; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 添加行政复议申请 + */ +export async function addLawLegalReview(data: LawLegalReview) { + const res = await request.post>( + MODULES_API_URL + '/law/law-legal-review', + data + ); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 修改行政复议申请 + */ +export async function updateLawLegalReview(data: LawLegalReview) { + const res = await request.put>( + MODULES_API_URL + '/law/law-legal-review', + data + ); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 删除行政复议申请 + */ +export async function removeLawLegalReview(id?: number) { + const res = await request.delete>( + MODULES_API_URL + '/law/law-legal-review/' + id + ); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 批量删除行政复议申请 + */ +export async function removeBatchLawLegalReview(data: (number | undefined)[]) { + const res = await request.delete>( + MODULES_API_URL + '/law/law-legal-review/batch', + { + data + } + ); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 根据id查询行政复议申请 + */ +export async function getLawLegalReview(id: number) { + const res = await request.get>( + MODULES_API_URL + '/law/law-legal-review/' + id + ); + if (res.data.code === 0 && res.data.data) { + return res.data.data; + } + return Promise.reject(new Error(res.data.message)); +} + +export async function lawLegalReviewExport(data: LawLegalReviewParam) { + const res = await request.post>( + MODULES_API_URL + '/law/law-legal-review/export', data + ); + if (res.data.code === 0 && res.data.data) { + return res.data.data; + } + return Promise.reject(new Error(res.data.message)); +} diff --git a/src/api/law/lawLegalReview/model/index.ts b/src/api/law/lawLegalReview/model/index.ts new file mode 100644 index 0000000..367ae06 --- /dev/null +++ b/src/api/law/lawLegalReview/model/index.ts @@ -0,0 +1,81 @@ +import type { PageParam } from '@/api'; + +/** + * 行政复议申请 + */ +export interface LawLegalReview { + // + id?: number; + // + userId?: number; + // + name?: string; + // + gender?: number; + // + phone?: string; + // + birthday?: string; + // + idCard?: string; + // 住所地址 + liveAddress?: string; + // 户籍地址 + householdAddress?: string; + // 说明 + content?: string; + // 是否删除, 0否, 1是 + deleted?: number; + // 租户id + tenantId?: number; + // 创建时间 + createTime?: string; + // 修改时间 + updateTime?: string; + // + nation?: string; + // 工作单位 + companyName?: string; + // + email?: string; + // 代理人姓名 + proxyName?: string; + // 代理人联系电话 + proxyPhone?: string; + // 关系 + proxyRelation?: string; + // 代理人身份证 + proxyIdCard?: string; + // 法人/负责人 + legalPerson?: string; + // 职位 + position?: string; + // 被申请人 + respondent?: string; + // 被申请人法人/负责人 + respondentLegalPerson?: string; + // 被申请人职位 + respondentPosition?: string; + // 被申请人地址 + respondentAddress?: string; + // 行政复议请求 + requestContent?: string; + // 行政复议理由 + requestReason?: string; + // 政府部门 + govName?: string; + // 材料 + files?: string; + // 申请人身份证明材料 + personFile?: string; + // 代理材料 + proxyFile?: string; +} + +/** + * 行政复议申请搜索条件 + */ +export interface LawLegalReviewParam extends PageParam { + id?: number; + keywords?: string; +} diff --git a/src/api/law/lawNotaryConfig/model/index.ts b/src/api/law/lawNotaryConfig/model/index.ts index 6e392f0..35f1de3 100644 --- a/src/api/law/lawNotaryConfig/model/index.ts +++ b/src/api/law/lawNotaryConfig/model/index.ts @@ -1,31 +1,32 @@ -import type { PageParam } from '@/api'; +import type { PageParam } from "@/api"; /** * 公证配置 */ export interface LawNotaryConfig { - // - id?: number; - // - title?: string; - // 配置 - configList?: string; - // - userId?: number; - // 是否删除, 0否, 1是 - deleted?: number; - // 租户id - tenantId?: number; - // 创建时间 - createTime?: string; - // 修改时间 - updateTime?: string; + // + id?: number; + // + title?: string; + type?: string; + // 配置 + configList?: string; + // + userId?: number; + // 是否删除, 0否, 1是 + deleted?: number; + // 租户id + tenantId?: number; + // 创建时间 + createTime?: string; + // 修改时间 + updateTime?: string; } /** * 公证配置搜索条件 */ export interface LawNotaryConfigParam extends PageParam { - id?: number; - keywords?: string; + id?: number; + keywords?: string; } diff --git a/src/api/law/lawPoorRequest/index.ts b/src/api/law/lawPoorRequest/index.ts new file mode 100644 index 0000000..d7cfa90 --- /dev/null +++ b/src/api/law/lawPoorRequest/index.ts @@ -0,0 +1,106 @@ +import request from '@/utils/request'; +import type { ApiResult, PageResult } from '@/api'; +import type { LawPoorRequest, LawPoorRequestParam } from './model'; +import { MODULES_API_URL } from '@/config/setting'; + +/** + * 分页查询 + */ +export async function pageLawPoorRequest(params: LawPoorRequestParam) { + const res = await request.get>>( + MODULES_API_URL + '/law/law-poor-request/page', + { + params + } + ); + if (res.data.code === 0) { + return res.data.data; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 查询列表 + */ +export async function listLawPoorRequest(params?: LawPoorRequestParam) { + const res = await request.get>( + MODULES_API_URL + '/law/law-poor-request', + { + params + } + ); + if (res.data.code === 0 && res.data.data) { + return res.data.data; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 添加 + */ +export async function addLawPoorRequest(data: LawPoorRequest) { + const res = await request.post>( + MODULES_API_URL + '/law/law-poor-request', + data + ); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 修改 + */ +export async function updateLawPoorRequest(data: LawPoorRequest) { + const res = await request.put>( + MODULES_API_URL + '/law/law-poor-request', + data + ); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 删除 + */ +export async function removeLawPoorRequest(id?: number) { + const res = await request.delete>( + MODULES_API_URL + '/law/law-poor-request/' + id + ); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 批量删除 + */ +export async function removeBatchLawPoorRequest(data: (number | undefined)[]) { + const res = await request.delete>( + MODULES_API_URL + '/law/law-poor-request/batch', + { + data + } + ); + if (res.data.code === 0) { + return res.data.message; + } + return Promise.reject(new Error(res.data.message)); +} + +/** + * 根据id查询 + */ +export async function getLawPoorRequest(id: number) { + const res = await request.get>( + MODULES_API_URL + '/law/law-poor-request/' + id + ); + if (res.data.code === 0 && res.data.data) { + return res.data.data; + } + return Promise.reject(new Error(res.data.message)); +} diff --git a/src/api/law/lawPoorRequest/model/index.ts b/src/api/law/lawPoorRequest/model/index.ts new file mode 100644 index 0000000..d11c045 --- /dev/null +++ b/src/api/law/lawPoorRequest/model/index.ts @@ -0,0 +1,49 @@ +import type { PageParam } from '@/api'; + +/** + * + */ +export interface LawPoorRequest { + // + id?: number; + // 人员列表 + peopleList?: string; + // 总收入 + totalIncome?: string; + // 人均月收入 + avgIncome?: string; + // 房产几套 + houseNum?: number; + // 房产面积 + houseArea?: string; + // 房产位置 + houseAddress?: string; + // 汽车品牌型号 + car?: string; + // 现金等资产 + cash?: string; + // 其他资产说明 + otherProperty?: string; + // 重大支出 + outcome?: string; + // + name?: string; + // + phone?: string; + // 是否删除, 0否, 1是 + deleted?: number; + // 租户id + tenantId?: number; + // 创建时间 + createTime?: string; + // 修改时间 + updateTime?: string; +} + +/** + * 搜索条件 + */ +export interface LawPoorRequestParam extends PageParam { + id?: number; + keywords?: string; +} diff --git a/src/views/cms/article/components/article-edit.vue b/src/views/cms/article/components/article-edit.vue index 1b1bc5f..20bfb86 100644 --- a/src/views/cms/article/components/article-edit.vue +++ b/src/views/cms/article/components/article-edit.vue @@ -29,7 +29,6 @@ @@ -57,9 +56,7 @@ - + diff --git a/src/views/law/lawLegalAid/index.vue b/src/views/law/lawLegalAid/index.vue index fad8ba4..e8410f8 100644 --- a/src/views/law/lawLegalAid/index.vue +++ b/src/views/law/lawLegalAid/index.vue @@ -31,8 +31,8 @@ @@ -65,6 +67,8 @@ import Search from "./components/search.vue"; import LawLegalAidEdit from "./components/lawLegalAidEdit.vue"; import { pageLawLegalAid, removeLawLegalAid, removeBatchLawLegalAid, lawLegalAidExport } from "@/api/law/lawLegalAid"; import type { LawLegalAid, LawLegalAidParam } from "@/api/law/lawLegalAid/model"; +import LawPoorRequestDetail from "@/views/law/lawPoorRequest/components/lawPoorRequestDetail.vue"; +import type { LawPoorRequest } from "@/api/law/lawPoorRequest/model"; // 表格实例 const tableRef = ref | null>(null); @@ -255,12 +259,23 @@ const customRow = (record: LawLegalAid) => { }; query(); +const showDetail = ref(false); +const currentDetail = ref(); +const openDetail = (row: LawLegalAid) => { + if (row.poorRequest) { + currentDetail.value = row.poorRequest; + showDetail.value = true; + }else { + message.error("该申请暂无经济困难申请详情"); + } +}; + const exportWord = async () => { - const hide = message.loading('导出中..', 0); - const { data } = await lawLegalAidExport() - window.open(data) - hide() -} + const hide = message.loading("导出中..", 0); + const { data } = await lawLegalAidExport(); + window.open(data); + hide(); +}; diff --git a/src/views/law/lawLegalMediate/components/search.vue b/src/views/law/lawLegalMediate/components/search.vue new file mode 100644 index 0000000..eb0c711 --- /dev/null +++ b/src/views/law/lawLegalMediate/components/search.vue @@ -0,0 +1,42 @@ + + + + diff --git a/src/views/law/lawLegalMediate/index.vue b/src/views/law/lawLegalMediate/index.vue new file mode 100644 index 0000000..9860932 --- /dev/null +++ b/src/views/law/lawLegalMediate/index.vue @@ -0,0 +1,248 @@ + + + + + + + diff --git a/src/views/law/lawLegalReview/components/lawLegalReviewEdit.vue b/src/views/law/lawLegalReview/components/lawLegalReviewEdit.vue new file mode 100644 index 0000000..a3b7a4d --- /dev/null +++ b/src/views/law/lawLegalReview/components/lawLegalReviewEdit.vue @@ -0,0 +1,91 @@ + + + + diff --git a/src/views/law/lawLegalReview/components/search.vue b/src/views/law/lawLegalReview/components/search.vue new file mode 100644 index 0000000..3195700 --- /dev/null +++ b/src/views/law/lawLegalReview/components/search.vue @@ -0,0 +1,47 @@ + + + + diff --git a/src/views/law/lawLegalReview/index.vue b/src/views/law/lawLegalReview/index.vue new file mode 100644 index 0000000..6a38ebe --- /dev/null +++ b/src/views/law/lawLegalReview/index.vue @@ -0,0 +1,254 @@ + + + + + + + diff --git a/src/views/law/lawNotaryConfig/components/lawNotaryConfigEdit.vue b/src/views/law/lawNotaryConfig/components/lawNotaryConfigEdit.vue index 3f77218..6d7abe8 100644 --- a/src/views/law/lawNotaryConfig/components/lawNotaryConfigEdit.vue +++ b/src/views/law/lawNotaryConfig/components/lawNotaryConfigEdit.vue @@ -19,6 +19,13 @@ styleResponsive ? { md: 19, sm: 19, xs: 24 } : { flex: '1' } " > + + + import { ref, reactive, watch } from "vue"; import { Form, message } from "ant-design-vue"; -import { assignObject, uuid } from "ele-admin-pro"; +import { assignObject } from "ele-admin-pro"; import { addLawNotaryConfig, updateLawNotaryConfig } from "@/api/law/lawNotaryConfig"; import { LawNotaryConfig } from "@/api/law/lawNotaryConfig/model"; import { useThemeStore } from "@/store/modules/theme"; @@ -86,6 +93,7 @@ const formRef = ref(null); const form = reactive({ id: undefined, title: undefined, + type: undefined, configList: undefined, userId: undefined, deleted: undefined, @@ -100,7 +108,14 @@ const updateVisible = (value: boolean) => { }; // 表单验证规则 -const rules = reactive({}); +const rules = reactive({ + title: [ + { required: true, message: "请输入名称", trigger: "blur" } + ], + type: [ + { required: true, message: "请输入分类", trigger: "blur" } + ] +}); const configList = ref([]); const addConfig = () => { diff --git a/src/views/law/lawNotaryConfig/index.vue b/src/views/law/lawNotaryConfig/index.vue index fc0fc48..702465d 100644 --- a/src/views/law/lawNotaryConfig/index.vue +++ b/src/views/law/lawNotaryConfig/index.vue @@ -107,6 +107,12 @@ align: 'center', width: 90, }, + { + title: '类型', + dataIndex: 'type', + key: 'type', + align: 'center', + }, { title: '名称', dataIndex: 'title', diff --git a/src/views/law/lawOrg/components/lawOrgEdit.vue b/src/views/law/lawOrg/components/lawOrgEdit.vue index f66f91a..d9399f5 100644 --- a/src/views/law/lawOrg/components/lawOrgEdit.vue +++ b/src/views/law/lawOrg/components/lawOrgEdit.vue @@ -49,7 +49,24 @@ /> -

已选坐标: {{ form.lng }},{{ form.lat }}

+
+ + + + + + + + +
@@ -61,7 +78,8 @@ - @@ -149,12 +167,22 @@ const getAreaList = async () => { const changeArea = (value, options) => { if (options) { form.provinceId = options[0].id; - if (options.length > 1) form.cityId = options[1].id; - if (options.length > 2) form.areaId = options[2].id; + form.province = options[0].name; + if (options.length > 1) { + form.cityId = options[1].id; + form.city = options[1].name; + } + if (options.length > 2) { + form.areaId = options[2].id; + form.region = options[2].name; + } } else { form.provinceId = undefined; + form.province = undefined; form.cityId = undefined; + form.city = undefined; form.areaId = undefined; + form.region = undefined; } }; diff --git a/src/views/law/lawOrgPeople/components/lawOrgPeopleEdit.vue b/src/views/law/lawOrgPeople/components/lawOrgPeopleEdit.vue index 2d5af27..8d20d3f 100644 --- a/src/views/law/lawOrgPeople/components/lawOrgPeopleEdit.vue +++ b/src/views/law/lawOrgPeople/components/lawOrgPeopleEdit.vue @@ -45,19 +45,24 @@ v-model:value="form.phone" />
- + - - + + + + + + @@ -134,7 +139,7 @@ const rules = reactive({ type: [ { required: true, - message: "请选择类型", + message: "请输入执业范围", type: "string", trigger: "blur" } @@ -158,7 +163,7 @@ const rules = reactive({ position: [ { required: true, - message: "请输入职称", + message: "请输入执业证号", type: "string", trigger: "blur" } @@ -166,19 +171,11 @@ const rules = reactive({ positionType: [ { required: true, - message: "请输入职位类别", + message: "请输入执业范围", type: "string", trigger: "blur" } ], - type: [ - { - required: true, - message: "请选择职业类别", - type: "string", - trigger: "blur" - } - ] }); const { resetFields } = useForm(form, rules); diff --git a/src/views/law/lawOrgPeople/index.vue b/src/views/law/lawOrgPeople/index.vue index 0c88645..7941a70 100644 --- a/src/views/law/lawOrgPeople/index.vue +++ b/src/views/law/lawOrgPeople/index.vue @@ -126,7 +126,7 @@ const columns = ref([ align: "center" }, { - title: "职称", + title: "执业证号", dataIndex: "position", key: "position", align: "center" diff --git a/src/views/law/lawPoorRequest/components/lawPoorRequestDetail.vue b/src/views/law/lawPoorRequest/components/lawPoorRequestDetail.vue new file mode 100644 index 0000000..65bbb6b --- /dev/null +++ b/src/views/law/lawPoorRequest/components/lawPoorRequestDetail.vue @@ -0,0 +1,158 @@ + + + + + diff --git a/src/views/law/lawPoorRequest/components/lawPoorRequestEdit.vue b/src/views/law/lawPoorRequest/components/lawPoorRequestEdit.vue new file mode 100644 index 0000000..cb9efc5 --- /dev/null +++ b/src/views/law/lawPoorRequest/components/lawPoorRequestEdit.vue @@ -0,0 +1,238 @@ + + + + diff --git a/src/views/law/lawPoorRequest/components/search.vue b/src/views/law/lawPoorRequest/components/search.vue new file mode 100644 index 0000000..82fea9d --- /dev/null +++ b/src/views/law/lawPoorRequest/components/search.vue @@ -0,0 +1,42 @@ + + + + diff --git a/src/views/law/lawPoorRequest/index.vue b/src/views/law/lawPoorRequest/index.vue new file mode 100644 index 0000000..9bd5cbd --- /dev/null +++ b/src/views/law/lawPoorRequest/index.vue @@ -0,0 +1,315 @@ + + + + + + +