yangjun
/
hldy_vue
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: yangjun:c252a103115a6dfa8a8368c6954007c51ec7a12c
Branches Tags
yangjun:master
..
compare: yangjun:1bb3dfe9753af0700b59103e136b74a7959ac62e
Branches Tags
yangjun:master

No commits in common. "c252a103115a6dfa8a8368c6954007c51ec7a12c" and "1bb3dfe9753af0700b59103e136b74a7959ac62e" have entirely different histories.
c252a10311 ... 1bb3dfe975

9 changed files with 55 additions and 1235 deletions
Show Stats Expand all files Collapse all files

7
src/views/biz/orgapplyinfo/OrgApplyInfo.data.ts
View File

@ -6,7 +6,7 @@ import { getWeekMonthQuarterYear } from '/@/utils';
//列表数据
export const columns: BasicColumn[] = [
{
title: '姓名',
title: '咨询人姓名',
align: 'center',
dataIndex: 'name',
},
@ -50,6 +50,11 @@ export const columns: BasicColumn[] = [
align: 'center',
dataIndex: 'status_dictText',
},
{
title: '审批备注',
align: 'center',
dataIndex: 'content',
},
];
// 高级查询数据

109
src/views/biz/orgapplyinfo/components/OrgApplyInfoForm.vue
View File

@ -5,101 +5,119 @@
<a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol"
name="OrgApplyInfoForm">
<a-row>
<a-col :span="24">
<SectionDivider :title="'入驻审批'" />
</a-col>
<a-col :span="12">
<a-form-item label="审批" v-bind="validateInfos.status" id="OrgApplyInfoForm-status" name="status">
<j-dict-select-tag v-model:value="formData.status" dictCode="org_apply_status" placeholder="请选择审批结果"
allow-clear />
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="审核备注" v-bind="validateInfos.content" id="OrgApplyInfoForm-content" name="content">
<a-input v-model:value="formData.content" placeholder="请输入审核备注" allow-clear></a-input>
</a-form-item>
</a-col>
<a-col :span="24">
<SectionDivider :title="'基本信息'" />
</a-col>
<a-col :span="12">
<a-form-item label="咨询人姓名" v-bind="validateInfos.name" id="OrgApplyInfoForm-name" name="name">
<a-input v-model:value="formData.name" placeholder="请输入咨询人姓名" :readOnly="true"></a-input>
<a-input v-model:value="formData.name" placeholder="请输入咨询人姓名" allow-clear></a-input>
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="联系电话" v-bind="validateInfos.tel" id="OrgApplyInfoForm-tel" name="tel">
<a-input v-model:value="formData.tel" placeholder="请输入联系电话" :readOnly="true"></a-input>
<a-input v-model:value="formData.tel" placeholder="请输入联系电话" allow-clear></a-input>
</a-form-item>
</a-col>
<!-- <a-col :span="12">
<a-form-item label="微信名称" v-bind="validateInfos.wechatName" id="OrgApplyInfoForm-wechatName"
name="wechatName">
<a-input v-model:value="formData.wechatName" placeholder="请输入微信名称" ></a-input>
<a-input v-model:value="formData.wechatName" placeholder="请输入微信名称" allow-clear></a-input>
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="微信id" v-bind="validateInfos.openId" id="OrgApplyInfoForm-openId" name="openId">
<a-input v-model:value="formData.openId" placeholder="请输入微信id" ></a-input>
<a-input v-model:value="formData.openId" placeholder="请输入微信id" allow-clear></a-input>
</a-form-item>
</a-col> -->
<a-col :span="12">
<a-form-item label="申请日期" v-bind="validateInfos.createTime" id="OrgApplyInfoForm-createTime"
name="createTime">
<a-input placeholder="申请日期" v-model:value="formData.createTime" style="width: 100%" readOnly />
<a-date-picker placeholder="请选择申请日期" v-model:value="formData.createTime" showTime
value-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" allow-clear />
</a-form-item>
</a-col>
<!-- <a-col :span="12">
<a-col :span="12">
<a-form-item label="机构是否完成入驻" v-bind="validateInfos.izEntry" id="OrgApplyInfoForm-izEntry" name="izEntry">
<a-select v-model:value="formData.izEntry" placeholder="请选择机构是否入驻" allowClear :readOnly="true">
<a-select v-model:value="formData.izEntry" placeholder="请选择机构是否入驻" allowClear>
<a-select-option value="0">未入驻</a-select-option>
<a-select-option value="1">已入驻</a-select-option>
</a-select>
</a-form-item>
</a-col> -->
</a-col>
<a-col :span="24">
<SectionDivider :title="'身份证'" />
</a-col>
<a-col :span="12">
<a-form-item label="性别" v-bind="validateInfos.sex" id="OrgApplyInfoForm-sex" name="sex">
<a-input v-model:value="formData.sex" placeholder="请输入性别" :readOnly="true"></a-input>
<a-input v-model:value="formData.sex" placeholder="请输入性别" allow-clear></a-input>
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="民族" v-bind="validateInfos.national" id="OrgApplyInfoForm-national" name="national">
<a-input v-model:value="formData.national" placeholder="请输入民族" :readOnly="true"></a-input>
<a-input v-model:value="formData.national" placeholder="请输入民族" allow-clear></a-input>
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="出生日期" v-bind="validateInfos.birthDate" id="OrgApplyInfoForm-birthDate"
name="birthDate">
<a-input placeholder="申请日期" v-model:value="formData.birthDate" style="width: 100%" readOnly />
<a-date-picker placeholder="请选择出生日期" v-model:value="formData.birthDate" showTime
value-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" allow-clear />
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="住址（身份证上）" v-bind="validateInfos.idCardAddress" id="OrgApplyInfoForm-idCardAddress"
name="idCardAddress">
<a-input v-model:value="formData.idCardAddress" placeholder="请输入住址（身份证上）" :readOnly="true"></a-input>
<a-input v-model:value="formData.idCardAddress" placeholder="请输入住址（身份证上）" allow-clear></a-input>
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="身份证号" v-bind="validateInfos.idCard" id="OrgApplyInfoForm-idCard" name="idCard">
<a-input v-model:value="formData.idCard" placeholder="请输入身份证号" :readOnly="true"></a-input>
<a-input v-model:value="formData.idCard" placeholder="请输入身份证号" allow-clear></a-input>
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="签发机关" v-bind="validateInfos.issuingAuthority" id="OrgApplyInfoForm-issuingAuthority"
name="issuingAuthority">
<a-input v-model:value="formData.issuingAuthority" placeholder="请输入签发机关" :readOnly="true"></a-input>
<a-input v-model:value="formData.issuingAuthority" placeholder="请输入签发机关" allow-clear></a-input>
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="有效开始日期" v-bind="validateInfos.startTime" id="OrgApplyInfoForm-startTime"
name="startTime">
<a-input placeholder="申请日期" v-model:value="formData.startTime" style="width: 100%" readOnly />
<a-date-picker placeholder="请选择有效开始日期" v-model:value="formData.startTime" showTime
value-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" allow-clear />
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="有效结束日期" v-bind="validateInfos.endTime" id="OrgApplyInfoForm-endTime" name="endTime">
<a-input placeholder="申请日期" v-model:value="formData.endTime" style="width: 100%" readOnly />
<a-date-picker placeholder="请选择有效结束日期" v-model:value="formData.endTime" showTime
value-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" allow-clear />
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="身份证正面" v-bind="validateInfos.cardZmPath" id="OrgApplyInfoForm-cardZmPath"
name="cardZmPath">
<JImageUpload :fileMax="1" v-model:value="formData.cardZmPath" :disabled="true"></JImageUpload>
<JImageUpload :fileMax="1" v-model:value="formData.cardZmPath"></JImageUpload>
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="身份证反面" v-bind="validateInfos.cardFmPath" id="OrgApplyInfoForm-cardFmPath"
name="cardFmPath">
<JImageUpload :fileMax="1" v-model:value="formData.cardFmPath" :disabled="true"></JImageUpload>
<JImageUpload :fileMax="1" v-model:value="formData.cardFmPath"></JImageUpload>
</a-form-item>
</a-col>
<a-col :span="24">
@ -108,31 +126,30 @@
<a-col :span="12">
<a-form-item label="营业执照照片" v-bind="validateInfos.comBusinessLicense"
id="OrgApplyInfoForm-comBusinessLicense" name="comBusinessLicense">
<JImageUpload :fileMax="1" v-model:value="formData.comBusinessLicense" :disabled="true"></JImageUpload>
<JImageUpload :fileMax="1" v-model:value="formData.comBusinessLicense"></JImageUpload>
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="企业名称" v-bind="validateInfos.comName" id="OrgApplyInfoForm-comName" name="comName">
<a-input v-model:value="formData.comName" placeholder="请输入企业名称" :readOnly="true"></a-input>
<a-input v-model:value="formData.comName" placeholder="请输入企业名称" allow-clear></a-input>
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="企业注册地址" v-bind="validateInfos.comRegisterAddress"
id="OrgApplyInfoForm-comRegisterAddress" name="comRegisterAddress">
<a-textarea v-model:value="formData.comRegisterAddress" placeholder="请输入企业注册地址"
:readOnly="true"></a-textarea>
<a-input v-model:value="formData.comRegisterAddress" placeholder="请输入企业注册地址" allow-clear></a-input>
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="企业信用代码" v-bind="validateInfos.comCreditCode" id="OrgApplyInfoForm-comCreditCode"
name="comCreditCode">
<a-input v-model:value="formData.comCreditCode" placeholder="请输入企业信用代码" :readOnly="true"></a-input>
<a-input v-model:value="formData.comCreditCode" placeholder="请输入企业信用代码" allow-clear></a-input>
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="企业法人" v-bind="validateInfos.comLegalPerson" id="OrgApplyInfoForm-comLegalPerson"
name="comLegalPerson">
<a-input v-model:value="formData.comLegalPerson" placeholder="请输入企业法人" :readOnly="true"></a-input>
<a-input v-model:value="formData.comLegalPerson" placeholder="请输入企业法人" allow-clear></a-input>
</a-form-item>
</a-col>
<a-col :span="24">
@ -147,56 +164,37 @@
<a-col :span="12">
<a-form-item label="机构地址" v-bind="validateInfos.orgAddress" id="OrgApplyInfoForm-orgAddress"
name="orgAddress">
<a-textarea v-model:value="formData.orgAddress" placeholder="请输入机构地址" :readOnly="true"></a-textarea>
<a-input v-model:value="formData.orgAddress" placeholder="请输入机构地址" allow-clear></a-input>
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="机构负责人" v-bind="validateInfos.orgLeader" id="OrgApplyInfoForm-orgLeader"
name="orgLeader">
<a-input v-model:value="formData.orgLeader" placeholder="请输入机构负责人" :readOnly="true"></a-input>
<a-input v-model:value="formData.orgLeader" placeholder="请输入机构负责人" allow-clear></a-input>
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="机构负责人电话" v-bind="validateInfos.orgLeaderPhone" id="OrgApplyInfoForm-orgLeaderPhone"
name="orgLeaderPhone">
<a-input v-model:value="formData.orgLeaderPhone" placeholder="请输入机构负责人电话" :readOnly="true"></a-input>
<a-input v-model:value="formData.orgLeaderPhone" placeholder="请输入机构负责人电话" allow-clear></a-input>
</a-form-item>
</a-col>
<!-- <a-col :span="12">
<a-form-item label="机构楼宇牌号" v-bind="validateInfos.orgBuildingNumber"
id="OrgApplyInfoForm-orgBuildingNumber" name="orgBuildingNumber">
<a-input v-model:value="formData.orgBuildingNumber" placeholder="请输入机构楼宇牌号" ></a-input>
<a-input v-model:value="formData.orgBuildingNumber" placeholder="请输入机构楼宇牌号" allow-clear></a-input>
</a-form-item>
</a-col> -->
<a-col :span="12">
<a-form-item label="机构房屋性质" v-bind="validateInfos.orgPropertyType" id="OrgApplyInfoForm-orgPropertyType"
name="orgPropertyType">
<a-input v-model:value="formData.orgPropertyType" placeholder="请输入机构房屋性质" :readOnly="true"></a-input>
<a-input v-model:value="formData.orgPropertyType" placeholder="请输入机构房屋性质" allow-clear></a-input>
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="机构建筑面积" v-bind="validateInfos.orgBuildingArea" id="OrgApplyInfoForm-orgBuildingArea"
name="orgBuildingArea">
<a-input v-model:value="formData.orgBuildingArea" placeholder="请输入机构建筑面积" addon-after="m²"
style="width: 100%" readOnly />
</a-form-item>
</a-col>
<a-col :span="24">
<SectionDivider :title="'入驻审批'" />
</a-col>
<a-col :span="12">
<a-form-item label="审批结果" v-bind="validateInfos.status" id="OrgApplyInfoForm-status" name="status">
<a-select v-model:value="formData.status" style="width: 200px" placeholder="请选择审批结果">
<a-select-option value="1">待审核</a-select-option>
<a-select-option value="2">审核通过</a-select-option>
<a-select-option value="3">驳回</a-select-option>
</a-select>
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="驳回原因" v-bind="validateInfos.content" id="OrgApplyInfoForm-content" name="content">
<a-textarea :autosize="{ minRows: 3 }" maxlength="50" show-count v-model:value="formData.content"
allow-clear placeholder="请输入驳回原因"></a-textarea>
<a-input-number v-model:value="formData.orgBuildingArea" placeholder="请输入机构建筑面积" style="width: 100%" />
</a-form-item>
</a-col>
</a-row>
@ -273,21 +271,10 @@ const formData = reactive<Record<string, any>>({
const tempNullVal = ref('')
const { createMessage } = useMessage();
const labelCol = ref<any>({ xs: { span: 24 }, sm: { span: 5 } });
const wrapperCol = ref<any>({ xs: { span: 24 }, sm: { span: 17 } });
const wrapperCol = ref<any>({ xs: { span: 24 }, sm: { span: 16 } });
const confirmLoading = ref<boolean>(false);
//表单验证
const validatorRules = reactive({
status: [{ required: true, message: '请选择审批结果!' },],
content: [
{
validator: async (_rule, value) => {
if (formData.status === '3' && !value) {
return Promise.reject('请输入驳回原因!');
}
return Promise.resolve();
},
},
],
});
const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, { immediate: false });

2
src/views/biz/orgapplyinfo/components/OrgApplyInfoModal.vue
View File

@ -31,7 +31,7 @@
* @param record
*/
function edit(record) {
title.value = disableSubmit.value ? '详情' : '机构加盟申请审批';
title.value = disableSubmit.value ? '详情' : '机构入驻申请审批';
visible.value = true;
nextTick(() => {
registerForm.value.edit(record);

81
src/views/biz/orgmodifyinfo/OrgModifyInfo.api.ts
View File

@ -1,81 +0,0 @@
import { defHttp } from '/@/utils/http/axios';
import { useMessage } from "/@/hooks/web/useMessage";
const { createConfirm } = useMessage();
enum Api {
list = '/orgapplyinfo/orgApplyInfo/modifyLlist',
save='/orgapplyinfo/orgApplyInfo/add',
edit='/orgapplyinfo/orgApplyInfo/edit',
deleteOne = '/orgapplyinfo/orgApplyInfo/delete',
deleteBatch = '/orgapplyinfo/orgApplyInfo/deleteBatch',
importExcel = '/orgapplyinfo/orgApplyInfo/importExcel',
exportXls = '/orgapplyinfo/orgApplyInfo/exportXls',
getModifyInfo = '/orgapplyinfo/orgApplyInfo/getModifyInfo',
}
/**
* 导出api
* @param params
*/
export const getExportUrl = Api.exportXls;
/**
* 导入api
*/
export const getImportUrl = Api.importExcel;
/**
* 列表接口
* @param params
*/
export const list = (params) => defHttp.get({ url: Api.list, params });
/**
* 删除单个
* @param params
* @param handleSuccess
*/
export const deleteOne = (params,handleSuccess) => {
return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => {
handleSuccess();
});
}
/**
* 批量删除
* @param params
* @param handleSuccess
*/
export const batchDelete = (params, handleSuccess) => {
createConfirm({
iconType: 'warning',
title: '确认删除',
content: '是否删除选中数据',
okText: '确认',
cancelText: '取消',
onOk: () => {
return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => {
handleSuccess();
});
}
});
}
/**
* 保存或者更新
* @param params
* @param isUpdate
*/
export const saveOrUpdate = (params, isUpdate) => {
let url = isUpdate ? Api.edit : Api.save;
return defHttp.post({ url: url, params }, { isTransformResponse: false });
}
/**
* 获取变更信息
* @param params
*/
export const getModifyInfo = (params) => {
return defHttp.post({ url: Api.getModifyInfo, params });
}

101
src/views/biz/orgmodifyinfo/OrgModifyInfo.data.ts
View File

@ -1,101 +0,0 @@
import { BasicColumn } from '/@/components/Table';
import { FormSchema } from '/@/components/Table';
import { rules } from '/@/utils/helper/validator';
import { render } from '/@/utils/common/renderUtils';
import { getWeekMonthQuarterYear } from '/@/utils';
//列表数据
export const columns: BasicColumn[] = [
{
title: '姓名',
align: 'center',
dataIndex: 'name',
},
{
title: '性别',
align: 'center',
dataIndex: 'sex',
},
{
title: '联系电话',
align: 'center',
dataIndex: 'tel',
},
{
title: '申请日期',
align: 'center',
dataIndex: 'createTime',
},
{
title: '机构地址',
align: 'center',
dataIndex: 'orgAddress',
},
{
title: '机构负责人电话',
align: 'center',
dataIndex: 'orgLeaderPhone',
},
{
title: '机构房屋性质',
align: 'center',
dataIndex: 'orgPropertyType',
},
{
title: '机构建筑面积',
align: 'center',
dataIndex: 'orgBuildingArea',
},
{
title: '审批状态',
align: 'center',
dataIndex: 'status_dictText',
},
];
// 高级查询数据
export const superQuerySchema = {
tel: { title: '联系电话', order: 2, view: 'text', type: 'string' },
status: { title: '状态 1审核中 2审核完成 3驳回 ', order: 3, view: 'list', type: 'string', dictCode: '' },
createTime: { title: '创建日期', order: 5, view: 'datetime', type: 'string' },
izEntry: { title: '机构是否入驻0否 1是(是否入驻过）', order: 7, view: 'list', type: 'string', dictCode: '' },
name: { title: '咨询人姓名', order: 8, view: 'text', type: 'string' },
sex: { title: '性别', order: 9, view: 'text', type: 'string' },
orgAddress: { title: '机构地址', order: 24, view: 'text', type: 'string' },
orgLeaderPhone: { title: '机构负责人电话', order: 27, view: 'text', type: 'string' },
orgPropertyType: { title: '机构房屋性质', order: 29, view: 'text', type: 'string' },
orgBuildingArea: { title: '机构建筑面积', order: 30, view: 'number', type: 'number' },
};
export const applyObj = {
openId: '微信id',
wechatName: '微信名称',
tel: '联系电话',
status: '审核状态',
content: '审核备注',
createTime: '申请时间',
name: '咨询人姓名',
sex: '性别',
national: '民族',
birthDate: '出生日期',
idCardAddress: '住址',
idCard: '身份证号',
issuingAuthority: '签发机关',
startTime: '有效开始日期',
endTime: '有效结束日期',
cardZmPath: '身份证正面照片',
cardFmPath: '身份证反面照片',
comBusinessLicense: '营业执照照片',
comName: '企业名称',
comRegisterAddress: '企业注册地址',
comCreditCode: '企业信用代码',
comLegalPerson: '企业法人',
orgAddress: '机构地址',
orgLeader: '机构负责人',
orgLeaderPhone: '机构负责人电话',
orgBuildingNumber: '机构楼宇牌号',
orgPropertyType: '机构房屋性质',
orgBuildingArea: '机构建筑面积',
orgProvince: '机构省份',
orgCity: '机构城市',
orgDistrict: '机构区域',
};

279
src/views/biz/orgmodifyinfo/OrgModifyInfoList.vue
View File

@ -1,279 +0,0 @@
<template>
<div class="p-2">
<!--查询区域-->
<div class="jeecg-basic-table-form-container">
<a-form ref="formRef" @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol"
:wrapper-col="wrapperCol">
<a-row :gutter="24">
<a-col :lg="6">
<a-form-item name="name">
<template #label><span title="姓名">姓名</span></template>
<JInput v-model:value="queryParam.name" />
</a-form-item>
</a-col>
<a-col :lg="6">
<a-form-item name="tel">
<template #label><span title="联系电话">联系电话</span></template>
<JInput v-model:value="queryParam.tel" />
</a-form-item>
</a-col>
<a-col :lg="6">
<a-form-item name="status">
<template #label><span title="审批状态">审批状态</span></template>
<j-dict-select-tag type="list" v-model:value="queryParam.status" dictCode="org_apply_status"
placeholder="请选择审批状态" allow-clear />
</a-form-item>
</a-col>
<a-col :lg="6">
<a-form-item name="orgBuildingArea">
<template #label><span title="建筑面积">建筑面积</span></template>
<JRangeNumber v-model:value="queryParam.orgBuildingArea" class="query-group-cust"></JRangeNumber>
</a-form-item>
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
<a-col :lg="6">
<a-button type="primary" preIcon="ant-design:search-outlined" @click="searchQuery">查询</a-button>
<a-button type="primary" preIcon="ant-design:reload-outlined" @click="searchReset"
style="margin-left: 8px">重置</a-button>
</a-col>
</span>
</a-col>
</a-row>
</a-form>
</div>
<!--引用表格-->
<BasicTable @register="registerTable">
<!--插槽:table标题-->
<template #tableTitle>
</template>
<!--操作栏-->
<template #action="{ record }">
<TableAction :actions="getTableAction(record)" />
</template>
<template v-slot:bodyCell="{ column, record, index, text }">
</template>
</BasicTable>
<!-- 表单区域 -->
<OrgModifyInfoModal ref="registerModal" @success="handleSuccess"></OrgModifyInfoModal>
</div>
</template>
<script lang="ts" name="orgmodifyinfo-orgModifyInfo" setup>
import { ref, reactive } from 'vue';
import { BasicTable, useTable, TableAction } from '/@/components/Table';
import { useListPage } from '/@/hooks/system/useListPage';
import { columns, superQuerySchema, applyObj } from './OrgModifyInfo.data';
import { list, deleteOne, batchDelete, getImportUrl, getExportUrl, getModifyInfo } from './OrgModifyInfo.api';
import { downloadFile } from '/@/utils/common/renderUtils';
import OrgModifyInfoModal from './components/OrgModifyInfoModal.vue'
import { useUserStore } from '/@/store/modules/user';
import JRangeNumber from "/@/components/Form/src/jeecg/components/JRangeNumber.vue";
import JInput from "/@/components/Form/src/jeecg/components/JInput.vue";
import { cloneDeep } from "lodash-es";
import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
const formRef = ref();
const queryParam = reactive<any>({});
const toggleSearchStatus = ref<boolean>(false);
const registerModal = ref();
const userStore = useUserStore();
//注册table数据
const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({
tableProps: {
title: '机构加盟申请信息表',
api: list,
columns,
canResize: false,
useSearchForm: false,
actionColumn: {
width: 120,
fixed: 'right',
},
beforeFetch: async (params) => {
let rangerQuery = await setRangeQuery();
return Object.assign(params, rangerQuery);
},
},
exportConfig: {
name: "机构加盟申请信息表",
url: getExportUrl,
params: queryParam,
},
importConfig: {
url: getImportUrl,
success: handleSuccess
},
});
const [registerTable, { reload, collapseAll, updateTableDataRecord, findTableDataRecord, getDataSource }, { rowSelection, selectedRowKeys }] = tableContext;
const labelCol = reactive({
xs: 24,
sm: 4,
xl: 6,
xxl: 5
});
const wrapperCol = reactive({
xs: 24,
sm: 19,
});
// 高级查询配置
const superQueryConfig = reactive(superQuerySchema);
/**
* 高级查询事件
*/
function handleSuperQuery(params) {
Object.keys(params).map((k) => {
queryParam[k] = params[k];
});
searchQuery();
}
/**
* 新增事件
*/
function handleAdd() {
registerModal.value.disableSubmit = false;
registerModal.value.add();
}
/**
* 编辑事件
*/
function handleEdit(record: Recordable) {
registerModal.value.disableSubmit = false;
registerModal.value.edit(record);
}
/**
* 详情
*/
function handleDetail(record: Recordable) {
registerModal.value.disableSubmit = true;
registerModal.value.edit(record);
}
/**
* 删除事件
*/
async function handleDelete(record) {
await deleteOne({ id: record.id }, handleSuccess);
}
/**
* 批量删除事件
*/
async function batchHandleDelete() {
await batchDelete({ ids: selectedRowKeys.value }, handleSuccess);
}
/**
* 成功回调
*/
function handleSuccess() {
(selectedRowKeys.value = []) && reload();
}
function handleAudit(record) {
getModifyInfo({ pkId: record.pkId }).then(res => {
registerModal?.value?.auditModify(res)
})
}
/**
* 操作栏
*/
function getTableAction(record) {
return [
{
label: '详情',
onClick: handleDetail.bind(null, record),
},
{
label: '审批',
onClick: handleAudit.bind(null, record),
auth: 'orgapplyinfo:nu_org_apply_info:edit',
ifShow: record.status == '4'
},
];
}
/**
* 查询
*/
function searchQuery() {
reload();
}
/**
* 重置
*/
function searchReset() {
formRef.value.resetFields();
selectedRowKeys.value = [];
//刷新数据
reload();
}
let rangeField = 'orgBuildingArea,'
/**
* 设置范围查询条件
*/
async function setRangeQuery() {
let queryParamClone = cloneDeep(queryParam);
if (rangeField) {
let fieldsValue = rangeField.split(',');
fieldsValue.forEach(item => {
if (queryParamClone[item]) {
let range = queryParamClone[item];
queryParamClone[item + '_begin'] = range[0];
queryParamClone[item + '_end'] = range[1];
delete queryParamClone[item];
} else {
queryParamClone[item + '_begin'] = '';
queryParamClone[item + '_end'] = '';
}
})
}
return queryParamClone;
}
</script>
<style lang="less" scoped>
.jeecg-basic-table-form-container {
padding: 0;
.table-page-search-submitButtons {
display: block;
margin-bottom: 24px;
white-space: nowrap;
}
.query-group-cust {
min-width: 100px !important;
}
.query-group-split-cust {
width: 30px;
display: inline-block;
text-align: center
}
.ant-form-item:not(.ant-form-item-with-help) {
margin-bottom: 16px;
height: 32px;
}
:deep(.ant-picker),
:deep(.ant-input-number) {
width: 100%;
}
}
</style>

230
src/views/biz/orgmodifyinfo/components/OrgHistoryForm.vue
View File

@ -1,230 +0,0 @@
<template>
<div class="container">
<a-form ref="formRef" layout="horizontal" :model="formData" :label-col="labelCol" :wrapper-col="wrapperCol">
<a-row :gutter="16">
<a-col :span="12">
<a-form-item label="审批结果" name="status" v-bind="validateInfos.status">
<a-select v-model:value="formData.status" style="width: 200px" placeholder="请选择审批结果">
<a-select-option value="modifyPass">审核通过</a-select-option>
<a-select-option value="modifyFail">驳回</a-select-option>
</a-select>
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="驳回原因" name="content" v-bind="validateInfos.content">
<a-textarea :maxlength="50" show-count v-model:value="formData.content"
placeholder="请输入驳回原因（如驳回）" style="width: 100%" />
</a-form-item>
</a-col>
</a-row>
</a-form>
<a-row>
<a-col :span="24" style="padding-top: 10px;padding-left: 30px;padding-right: 30px;">
<a-table :dataSource="filteredTableData" :columns="columns" :pagination="false" bordered size="small"
:scroll="{ y: '45vh' }" :rowClassName="setRowClassName">
<template #bodyCell="{ column, record }">
<template v-if="column.dataIndex === 'd1'">
<span>{{ applyObj[record.d1] }}</span>
</template>
<template v-if="column.dataIndex === 'd2' && isImg(record.d1)">
<JImageUpload :fileMax="1" v-model:value="record.d2" disabled></JImageUpload>
</template>
<template v-if="column.dataIndex === 'd3' && isImg(record.d1)">
<JImageUpload :fileMax="1" v-model:value="record.d3" disabled></JImageUpload>
</template>
<template
v-if="column.dataIndex === 'd2' && (record.d1 == 'orgProvince' || record.d1 == 'orgCity' || record.d1 == 'orgDistrict')">
<span>{{ provinceOptions[record.d2] }}</span>
</template>
<template
v-if="column.dataIndex === 'd3' && (record.d1 == 'orgProvince' || record.d1 == 'orgCity' || record.d1 == 'orgDistrict')">
<span>{{ provinceOptions[record.d3] }}</span>
</template>
</template>
</a-table>
</a-col>
</a-row>
</div>
</template>
<script lang="ts" setup>
import { ref, reactive, computed, onMounted } from 'vue';
import { Table as ATable, Input, Row, Col, Form } from 'ant-design-vue';
import { applyObj } from '../OrgModifyInfo.data'
import JImageUpload from '/@/components/Form/src/jeecg/components/JImageUpload.vue';
import { saveOrUpdate } from '../OrgModifyInfo.api';
import { useMessage } from '/@/hooks/web/useMessage';
import { initDictOptions } from '/@/utils/dict';
const formRef = ref();
const AForm = Form;
const AFormItem = Form.Item;
const useForm = Form.useForm;
const { createMessage } = useMessage();
// 表单标签布局配置
const labelCol = { span: 4 }; // 标签宽度
const wrapperCol = { span: 18 }; // 控件宽度
const isImg = (v_) => {
return v_ == 'cardZmPath' || v_ == 'cardFmPath' || v_ == 'comBusinessLicense'
}
const provinceOptions = ref({})
const formData = reactive<Record<string, any>>({
status: undefined,
content: '',
id: '',
pkId: ''
});
const validatorRules = reactive({
status: [{ required: true, message: '请选择审批结果!' },],
content: [
{
validator: async (_rule, value) => {
if (formData.status === 'modifyFail' && !value) {
return Promise.reject('请输入驳回原因!');
}
return Promise.resolve();
},
},
],
})
const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, { immediate: false });
const tableData = ref([]);
const emit = defineEmits(['ok']);
// 计算属性，过滤掉不需要显示的字段
const filteredTableData = computed(() => {
return tableData.value.filter(item =>
item.d1 !== 'id'
&& item.d1 !== 'pkId'
&& item.d1 !== 'openId'
&& item.d1 !== 'wechatName'
&& item.d1 !== 'status'
&& item.d1 !== 'content'
&& item.d1 !== 'createBy'
&& item.d1 !== 'updateBy'
&& item.d1 !== 'updateTime'
&& item.d1 !== 'izEntry'
&& item.d1 !== 'orgCoordinateLo'
&& item.d1 !== 'orgCoordinateLa'
&& item.d1 !== 'modifyStatus'
);
});
const columns = [
{
title: '名称',
dataIndex: 'd1',
key: 'd1',
width: 150,
ellipsis: true
},
{
title: '原始信息',
dataIndex: 'd2',
key: 'd2',
ellipsis: true
},
{
title: '变更信息',
dataIndex: 'd3',
key: 'd3',
ellipsis: true
}
];
// 设置行类名
const setRowClassName = (record) => {
return record.d2 !== record.d3 && record.d1 !== 'createTime' ? 'highlight-row' : '';
};
function show(data) {
// 存储id和pkId到formData
const idRecord = data.find(item => item.d1 === 'id');
const pkIdRecord = data.find(item => item.d1 === 'pkId');
const statusRecord = data.find(item => item.d1 === 'status');
if (idRecord) {
formData.id = idRecord.d3;
}
if (pkIdRecord) {
formData.pkId = pkIdRecord.d3;
}
if (statusRecord?.status == '4') {
formData.status = 'modifyPass'
}
if (statusRecord?.status == '5') {
formData.status = 'modifyFail'
}
tableData.value = data.map(item => ({
...item,
// 处理null/undefined显示为空字符串
d2: item.d2 ?? '',
d3: item.d3 ?? ''
}));
}
async function submitForm() {
try {
// 触发表单验证
await validate();
} catch ({ errorFields }) {
if (errorFields) {
const firstField = errorFields[0];
if (firstField) {
formRef.value.scrollToField(firstField.name, { behavior: 'smooth', block: 'center' });
}
}
return Promise.reject(errorFields);
}
saveOrUpdate(formData, true)
.then((res) => {
if (res.success) {
createMessage.success(res.message);
emit('ok');
} else {
createMessage.warning(res.message);
}
})
}
// 初始化numberValues
onMounted(async () => {
const dictData = await initDictOptions('sys_category,name,id,first_letter is not null order by code asc', '');
dictData.reduce((prev, next) => {
if (next) {
provinceOptions.value[next['value']] = next['text'] || next['label']
}
return prev;
}, []);
});
defineExpose({
show,
submitForm
});
</script>
<style lang="less" scoped>
.container {
padding: 16px;
}
.antd-modal-form {
padding: 14px;
}
:deep(.ant-table-cell) {
padding: 8px 12px !important;
}
// 高亮行样式
:deep(.highlight-row) {
background-color: #fff1f0 !important; // 浅红色背景
}
// 表单样式调整
:deep(.ant-form-item) {
margin-bottom: 16px;
}
</style>

378
src/views/biz/orgmodifyinfo/components/OrgModifyInfoForm.vue
View File

@ -1,378 +0,0 @@
<template>
<a-spin :spinning="confirmLoading">
<JFormContainer :disabled="disabled">
<template #detail>
<a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol"
name="OrgModifyInfoForm">
<a-row>
<a-col :span="24">
<SectionDivider :title="'入驻审批'" />
</a-col>
<a-col :span="12">
<a-form-item label="审批" v-bind="validateInfos.status" id="OrgModifyInfoForm-status" name="status">
<j-dict-select-tag v-model:value="formData.status" dictCode="org_apply_status" placeholder="请选择审批结果"
allow-clear />
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="审核备注" v-bind="validateInfos.content" id="OrgModifyInfoForm-content" name="content">
<a-input v-model:value="formData.content" placeholder="请输入审核备注" allow-clear></a-input>
</a-form-item>
</a-col>
<a-col :span="24">
<SectionDivider :title="'基本信息'" />
</a-col>
<a-col :span="12">
<a-form-item label="咨询人姓名" v-bind="validateInfos.name" id="OrgModifyInfoForm-name" name="name">
<a-input v-model:value="formData.name" placeholder="请输入咨询人姓名" allow-clear></a-input>
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="联系电话" v-bind="validateInfos.tel" id="OrgModifyInfoForm-tel" name="tel">
<a-input v-model:value="formData.tel" placeholder="请输入联系电话" allow-clear></a-input>
</a-form-item>
</a-col>
<!-- <a-col :span="12">
<a-form-item label="微信名称" v-bind="validateInfos.wechatName" id="OrgModifyInfoForm-wechatName"
name="wechatName">
<a-input v-model:value="formData.wechatName" placeholder="请输入微信名称" allow-clear></a-input>
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="微信id" v-bind="validateInfos.openId" id="OrgModifyInfoForm-openId" name="openId">
<a-input v-model:value="formData.openId" placeholder="请输入微信id" allow-clear></a-input>
</a-form-item>
</a-col> -->
<a-col :span="12">
<a-form-item label="申请日期" v-bind="validateInfos.createTime" id="OrgModifyInfoForm-createTime"
name="createTime">
<a-date-picker placeholder="请选择申请日期" v-model:value="formData.createTime" showTime
value-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" allow-clear />
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="机构是否完成入驻" v-bind="validateInfos.izEntry" id="OrgModifyInfoForm-izEntry" name="izEntry">
<a-select v-model:value="formData.izEntry" placeholder="请选择机构是否入驻" allowClear>
<a-select-option value="0">未入驻</a-select-option>
<a-select-option value="1">已入驻</a-select-option>
</a-select>
</a-form-item>
</a-col>
<a-col :span="24">
<SectionDivider :title="'身份证'" />
</a-col>
<a-col :span="12">
<a-form-item label="性别" v-bind="validateInfos.sex" id="OrgModifyInfoForm-sex" name="sex">
<a-input v-model:value="formData.sex" placeholder="请输入性别" allow-clear></a-input>
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="民族" v-bind="validateInfos.national" id="OrgModifyInfoForm-national" name="national">
<a-input v-model:value="formData.national" placeholder="请输入民族" allow-clear></a-input>
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="出生日期" v-bind="validateInfos.birthDate" id="OrgModifyInfoForm-birthDate"
name="birthDate">
<a-date-picker placeholder="请选择出生日期" v-model:value="formData.birthDate" showTime
value-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" allow-clear />
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="住址（身份证上）" v-bind="validateInfos.idCardAddress" id="OrgModifyInfoForm-idCardAddress"
name="idCardAddress">
<a-input v-model:value="formData.idCardAddress" placeholder="请输入住址（身份证上）" allow-clear></a-input>
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="身份证号" v-bind="validateInfos.idCard" id="OrgModifyInfoForm-idCard" name="idCard">
<a-input v-model:value="formData.idCard" placeholder="请输入身份证号" allow-clear></a-input>
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="签发机关" v-bind="validateInfos.issuingAuthority" id="OrgModifyInfoForm-issuingAuthority"
name="issuingAuthority">
<a-input v-model:value="formData.issuingAuthority" placeholder="请输入签发机关" allow-clear></a-input>
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="有效开始日期" v-bind="validateInfos.startTime" id="OrgModifyInfoForm-startTime"
name="startTime">
<a-date-picker placeholder="请选择有效开始日期" v-model:value="formData.startTime" showTime
value-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" allow-clear />
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="有效结束日期" v-bind="validateInfos.endTime" id="OrgModifyInfoForm-endTime" name="endTime">
<a-date-picker placeholder="请选择有效结束日期" v-model:value="formData.endTime" showTime
value-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" allow-clear />
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="身份证正面" v-bind="validateInfos.cardZmPath" id="OrgModifyInfoForm-cardZmPath"
name="cardZmPath">
<JImageUpload :fileMax="1" v-model:value="formData.cardZmPath"></JImageUpload>
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="身份证反面" v-bind="validateInfos.cardFmPath" id="OrgModifyInfoForm-cardFmPath"
name="cardFmPath">
<JImageUpload :fileMax="1" v-model:value="formData.cardFmPath"></JImageUpload>
</a-form-item>
</a-col>
<a-col :span="24">
<SectionDivider :title="'企业资质'" />
</a-col>
<a-col :span="12">
<a-form-item label="营业执照照片" v-bind="validateInfos.comBusinessLicense"
id="OrgModifyInfoForm-comBusinessLicense" name="comBusinessLicense">
<JImageUpload :fileMax="1" v-model:value="formData.comBusinessLicense"></JImageUpload>
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="企业名称" v-bind="validateInfos.comName" id="OrgModifyInfoForm-comName" name="comName">
<a-input v-model:value="formData.comName" placeholder="请输入企业名称" allow-clear></a-input>
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="企业注册地址" v-bind="validateInfos.comRegisterAddress"
id="OrgModifyInfoForm-comRegisterAddress" name="comRegisterAddress">
<a-textarea v-model:value="formData.comRegisterAddress" placeholder="请输入企业注册地址" allow-clear></a-textarea>
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="企业信用代码" v-bind="validateInfos.comCreditCode" id="OrgModifyInfoForm-comCreditCode"
name="comCreditCode">
<a-input v-model:value="formData.comCreditCode" placeholder="请输入企业信用代码" allow-clear></a-input>
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="企业法人" v-bind="validateInfos.comLegalPerson" id="OrgModifyInfoForm-comLegalPerson"
name="comLegalPerson">
<a-input v-model:value="formData.comLegalPerson" placeholder="请输入企业法人" allow-clear></a-input>
</a-form-item>
</a-col>
<a-col :span="24">
<SectionDivider :title="'机构信息'" />
</a-col>
<a-col :span="12">
<a-form-item label="机构所在地">
<span>{{ formData.orgProvince_dictText + formData.orgCity_dictText + formData.orgDistrict_dictText
}}</span>
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="机构地址" v-bind="validateInfos.orgAddress" id="OrgModifyInfoForm-orgAddress"
name="orgAddress">
<a-textarea v-model:value="formData.orgAddress" placeholder="请输入机构地址" allow-clear></a-textarea>
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="机构负责人" v-bind="validateInfos.orgLeader" id="OrgModifyInfoForm-orgLeader"
name="orgLeader">
<a-input v-model:value="formData.orgLeader" placeholder="请输入机构负责人" allow-clear></a-input>
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="机构负责人电话" v-bind="validateInfos.orgLeaderPhone" id="OrgModifyInfoForm-orgLeaderPhone"
name="orgLeaderPhone">
<a-input v-model:value="formData.orgLeaderPhone" placeholder="请输入机构负责人电话" allow-clear></a-input>
</a-form-item>
</a-col>
<!-- <a-col :span="12">
<a-form-item label="机构楼宇牌号" v-bind="validateInfos.orgBuildingNumber"
id="OrgModifyInfoForm-orgBuildingNumber" name="orgBuildingNumber">
<a-input v-model:value="formData.orgBuildingNumber" placeholder="请输入机构楼宇牌号" allow-clear></a-input>
</a-form-item>
</a-col> -->
<a-col :span="12">
<a-form-item label="机构房屋性质" v-bind="validateInfos.orgPropertyType" id="OrgModifyInfoForm-orgPropertyType"
name="orgPropertyType">
<a-input v-model:value="formData.orgPropertyType" placeholder="请输入机构房屋性质" allow-clear></a-input>
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="机构建筑面积" v-bind="validateInfos.orgBuildingArea" id="OrgModifyInfoForm-orgBuildingArea"
name="orgBuildingArea">
<a-input v-model:value="formData.orgBuildingArea" placeholder="请输入机构建筑面积" addon-after="m²" style="width: 100%" />
</a-form-item>
</a-col>
</a-row>
</a-form>
</template>
</JFormContainer>
<!-- <a-col :span="24" v-if="!!formData.orgCoordinateLa && !!formData.orgCoordinateLo">
<TencentMap :latitude="formData.orgCoordinateLa" :longitude="formData.orgCoordinateLo" />
</a-col> -->
</a-spin>
</template>
<script lang="ts" setup>
import { ref, reactive, defineExpose, nextTick, defineProps, computed, onMounted } from 'vue';
import { defHttp } from '/@/utils/http/axios';
import { useMessage } from '/@/hooks/web/useMessage';
import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
import { getValueType } from '/@/utils';
import { saveOrUpdate } from '../OrgModifyInfo.api';
import { Form } from 'ant-design-vue';
import JFormContainer from '/@/components/Form/src/container/JFormContainer.vue';
import TencentMap from '/@/components/TencentMap/TencentMap.vue';
import JImageUpload from '/@/components/Form/src/jeecg/components/JImageUpload.vue';
const props = defineProps({
formDisabled: { type: Boolean, default: false },
formData: { type: Object, default: () => ({}) },
formBpm: { type: Boolean, default: true }
});
const formRef = ref();
const useForm = Form.useForm;
const emit = defineEmits(['register', 'ok']);
const formData = reactive<Record<string, any>>({
id: '',
openId: '',
wechatName: '',
tel: '',
status: '',
content: '',
createTime: '',
updateTime: '',
izEntry: '',
name: '',
sex: '',
national: '',
birthDate: '',
idCardAddress: '',
idCard: '',
issuingAuthority: '',
startTime: '',
endTime: '',
cardZmPath: '',
cardFmPath: '',
comBusinessLicense: '',
comName: '',
comRegisterAddress: '',
comCreditCode: '',
comLegalPerson: '',
orgAddress: '',
orgCoordinateLo: '',
orgCoordinateLa: '',
orgLeader: '',
orgLeaderPhone: '',
orgBuildingNumber: '',
orgPropertyType: '',
orgBuildingArea: undefined,
orgProvince: '',
orgCity: '',
orgDistrict: '',
orgProvince_dictText: '',
orgCity_dictText: '',
orgDistrict_dictText: '',
});
const tempNullVal = ref('')
const { createMessage } = useMessage();
const labelCol = ref<any>({ xs: { span: 24 }, sm: { span: 5 } });
const wrapperCol = ref<any>({ xs: { span: 24 }, sm: { span: 16 } });
const confirmLoading = ref<boolean>(false);
//表单验证
const validatorRules = reactive({
});
const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, { immediate: false });
// 表单禁用
const disabled = computed(() => {
if (props.formBpm === true) {
if (props.formData.disabled === false) {
return false;
} else {
return true;
}
}
return props.formDisabled;
});
/**
* 新增
*/
function add() {
edit({});
}
/**
* 编辑
*/
function edit(record) {
nextTick(() => {
resetFields();
const tmpData = {};
Object.keys(formData).forEach((key) => {
if (record.hasOwnProperty(key)) {
tmpData[key] = record[key]
}
})
//赋值
Object.assign(formData, tmpData);
});
}
/**
* 提交数据
*/
async function submitForm() {
try {
// 触发表单验证
await validate();
} catch ({ errorFields }) {
if (errorFields) {
const firstField = errorFields[0];
if (firstField) {
formRef.value.scrollToField(firstField.name, { behavior: 'smooth', block: 'center' });
}
}
return Promise.reject(errorFields);
}
confirmLoading.value = true;
const isUpdate = ref<boolean>(false);
//时间格式化
let model = formData;
if (model.id) {
isUpdate.value = true;
}
//循环数据
for (let data in model) {
//如果该数据是数组并且是字符串类型
if (model[data] instanceof Array) {
let valueType = getValueType(formRef.value.getProps, data);
//如果是字符串类型的需要变成以逗号分割的字符串
if (valueType === 'string') {
model[data] = model[data].join(',');
}
}
}
await saveOrUpdate(model, isUpdate.value)
.then((res) => {
if (res.success) {
createMessage.success(res.message);
emit('ok');
} else {
createMessage.warning(res.message);
}
})
.finally(() => {
confirmLoading.value = false;
});
}
defineExpose({
add,
edit,
submitForm,
});
</script>
<style lang="less" scoped>
.antd-modal-form {
padding: 14px;
}
</style>

103
src/views/biz/orgmodifyinfo/components/OrgModifyInfoModal.vue
View File

@ -1,103 +0,0 @@
<template>
<j-modal :title="title" width="70vw" :visible="infoVisible" @ok="handleOk"
:okButtonProps="{ class: { 'jee-hidden': disableSubmit } }" @cancel="handleCancel" cancelText="关闭">
<OrgModifyInfoForm ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false">
</OrgModifyInfoForm>
</j-modal>
<j-modal :title="'机构信息变更审核'" width="70vw" :visible="hisVisible" @ok="handleModifyOk" @cancel="handleCancel" cancelText="关闭">
<OrgHistoryForm ref="historyRef" @ok="submitCallback" v-if="hisVisible"></OrgHistoryForm>
</j-modal>
</template>
<script lang="ts" setup>
import { ref, nextTick, defineExpose } from 'vue';
import OrgModifyInfoForm from './OrgModifyInfoForm.vue'
import OrgHistoryForm from './OrgHistoryForm.vue'
import JModal from '/@/components/Modal/src/JModal/JModal.vue';
const title = ref<string>('');
const infoVisible = ref<boolean>(false);
const hisVisible = ref<boolean>(false);
const disableSubmit = ref<boolean>(false);
const registerForm = ref();
const historyRef = ref();
const emit = defineEmits(['register', 'success']);
/**
* 新增
*/
function add() {
title.value = '新增';
infoVisible.value = true;
nextTick(() => {
registerForm.value.add();
});
}
/**
* 机构信息变更
*/
function auditModify(data) {
hisVisible.value = true;
nextTick(() => {
historyRef.value.show(data);
});
}
/**
* 编辑
* @param record
*/
function edit(record) {
title.value = disableSubmit.value ? '详情' : '机构信息变更审批';
infoVisible.value = true;
nextTick(() => {
registerForm.value.edit(record);
});
}
/**
* 确定按钮点击事件
*/
function handleOk() {
registerForm.value.submitForm();
}
/**
* 确定机构变更信息审核
*/
function handleModifyOk() {
historyRef.value.submitForm();
}
/**
* form保存回调事件
*/
function submitCallback() {
handleCancel();
emit('success');
}
/**
* 取消按钮回调事件
*/
function handleCancel() {
infoVisible.value = false;
hisVisible.value = false;
}
defineExpose({
add,
edit,
disableSubmit,
auditModify,
});
</script>
<style lang="less">
/**隐藏样式-modal确定按钮 */
.jee-hidden {
display: none !important;
}
</style>
<style lang="less" scoped></style>