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

Compare commits

base: yangjun:732d2a1e06355e73976c1b32c04db2a5c654fa7b
Branches Tags
yangjun:master
..
compare: yangjun:9a7c2aa6ede37d75e341868b98b57ee27b0e5ffc
Branches Tags
yangjun:master

No commits in common. "732d2a1e06355e73976c1b32c04db2a5c654fa7b" and "9a7c2aa6ede37d75e341868b98b57ee27b0e5ffc" have entirely different histories.
732d2a1e06 ... 9a7c2aa6ed

7 changed files with 166 additions and 131 deletions
Show Stats Expand all files Collapse all files

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

@ -6,19 +6,19 @@ import { getWeekMonthQuarterYear } from '/@/utils';
//列表数据 //列表数据
export const columns: BasicColumn[] = [ export const columns: BasicColumn[] = [
{ {
title: '企业名称', title: '姓名',
align: 'center', align: 'center',
dataIndex: 'comName', dataIndex: 'name',
}, },
{ {
title: '机构负责人', title: '性别',
align: 'center', align: 'center',
dataIndex: 'orgLeader', dataIndex: 'sex',
}, },
{ {
title: '机构负责人电话', title: '联系电话',
align: 'center', align: 'center',
dataIndex: 'orgLeaderPhone', dataIndex: 'tel',
}, },
{ {
title: '申请日期', title: '申请日期',
@ -26,17 +26,27 @@ export const columns: BasicColumn[] = [
dataIndex: 'createTime', dataIndex: 'createTime',
}, },
{ {
title: '房屋性质', title: '机构地址',
align: 'center',
dataIndex: 'orgAddress',
},
{
title: '机构负责人电话',
align: 'center',
dataIndex: 'orgLeaderPhone',
},
{
title: '机构房屋性质',
align: 'center', align: 'center',
dataIndex: 'orgPropertyType', dataIndex: 'orgPropertyType',
}, },
{ {
title: '面积', title: '机构建筑面积',
align: 'center', align: 'center',
dataIndex: 'orgBuildingArea', dataIndex: 'orgBuildingArea',
}, },
{ {
title: '审批意见', title: '审批状态',
align: 'center', align: 'center',
dataIndex: 'status_dictText', dataIndex: 'status_dictText',
}, },

41
src/views/biz/orgapplyinfo/OrgApplyInfoList.vue
View File

@ -6,32 +6,28 @@
:wrapper-col="wrapperCol"> :wrapper-col="wrapperCol">
<a-row :gutter="24"> <a-row :gutter="24">
<a-col :lg="6"> <a-col :lg="6">
<a-form-item name="comName"> <a-form-item name="name">
<template #label><span title="企业名称">企业名称</span></template> <template #label><span title="姓名">姓名</span></template>
<JInput v-model:value="queryParam.comName" /> <JInput v-model:value="queryParam.name" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :lg="6"> <a-col :lg="6">
<a-form-item name="orgLeader"> <a-form-item name="tel">
<template #label><span title="机构负责人">机构负责人</span></template> <template #label><span title="联系电话">联系电话</span></template>
<JInput v-model:value="queryParam.orgLeader" /> <JInput v-model:value="queryParam.tel" />
</a-form-item>
</a-col>
<a-col :lg="6">
<a-form-item name="createTime">
<template #label><span title="申请日期">申请日期</span></template>
<a-range-picker value-format="YYYY-MM-DD" v-model:value="queryParam.createTime"
class="query-group-cust" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :lg="6"> <a-col :lg="6">
<a-form-item name="status"> <a-form-item name="status">
<template #label><span title="审批意见">审批意见</span></template> <template #label><span title="审批状态">审批状态</span></template>
<a-select v-model:value="queryParam.status" style="width: 200px" placeholder="请选择审批意见"> <j-dict-select-tag type="list" v-model:value="queryParam.status" dictCode="org_apply_status"
<a-select-option value="1">待审核</a-select-option> placeholder="请选择审批状态" allow-clear />
<a-select-option value="2">审核通过</a-select-option> </a-form-item>
<a-select-option value="3">审核驳回</a-select-option> </a-col>
</a-select> <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-form-item>
</a-col> </a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24"> <a-col :xl="6" :lg="7" :md="8" :sm="24">
@ -215,7 +211,11 @@ function searchReset() {
reload(); reload();
} }
let rangeField = 'createTime,'
let rangeField = 'orgBuildingArea,'
/** /**
* 设置范围查询条件 * 设置范围查询条件
@ -238,7 +238,6 @@ async function setRangeQuery() {
} }
return queryParamClone; return queryParamClone;
} }
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>

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

@ -5,32 +5,55 @@
<a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol" <a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol"
name="OrgApplyInfoForm"> name="OrgApplyInfoForm">
<a-row> <a-row>
<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-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-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-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-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-form-item>
</a-col>
<!-- <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-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"> <a-col :span="24">
<SectionDivider :title="'身份证'" /> <SectionDivider :title="'身份证'" />
</a-col> </a-col>
</a-row>
<a-row>
<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>
</a-form-item>
</a-col>
</a-row>
<a-row>
<a-col :span="12">
<a-form-item label="姓名" v-bind="validateInfos.name" id="OrgApplyInfoForm-name" name="name">
<a-input v-model:value="formData.name" :readOnly="true"></a-input>
</a-form-item>
</a-col>
<a-col :span="12"> <a-col :span="12">
<a-form-item label="性别" v-bind="validateInfos.sex" id="OrgApplyInfoForm-sex" name="sex"> <a-form-item label="性别" v-bind="validateInfos.sex" id="OrgApplyInfoForm-sex" name="sex">
<a-input v-model:value="formData.sex" :readOnly="true"></a-input> <a-input v-model:value="formData.sex" placeholder="请输入性别" :readOnly="true"></a-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="12"> <a-col :span="12">
<a-form-item label="民族" v-bind="validateInfos.national" id="OrgApplyInfoForm-national" name="national"> <a-form-item label="民族" v-bind="validateInfos.national" id="OrgApplyInfoForm-national" name="national">
<a-input v-model:value="formData.national" :readOnly="true"></a-input> <a-input v-model:value="formData.national" placeholder="请输入民族" :readOnly="true"></a-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="12"> <a-col :span="12">
@ -42,28 +65,18 @@
<a-col :span="12"> <a-col :span="12">
<a-form-item label="住址（身份证上）" v-bind="validateInfos.idCardAddress" id="OrgApplyInfoForm-idCardAddress" <a-form-item label="住址（身份证上）" v-bind="validateInfos.idCardAddress" id="OrgApplyInfoForm-idCardAddress"
name="idCardAddress"> name="idCardAddress">
<a-input v-model:value="formData.idCardAddress" :readOnly="true"></a-input> <a-input v-model:value="formData.idCardAddress" placeholder="请输入住址（身份证上）" :readOnly="true"></a-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="12"> <a-col :span="12">
<a-form-item label="身份证号" v-bind="validateInfos.idCard" id="OrgApplyInfoForm-idCard" name="idCard"> <a-form-item label="身份证号" v-bind="validateInfos.idCard" id="OrgApplyInfoForm-idCard" name="idCard">
<a-input v-model:value="formData.idCard" :readOnly="true"></a-input> <a-input v-model:value="formData.idCard" placeholder="请输入身份证号" :readOnly="true"></a-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
</a-row>
<a-row>
<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>
</a-form-item>
</a-col>
</a-row>
<a-row>
<a-col :span="12"> <a-col :span="12">
<a-form-item label="签发机关" v-bind="validateInfos.issuingAuthority" id="OrgApplyInfoForm-issuingAuthority" <a-form-item label="签发机关" v-bind="validateInfos.issuingAuthority" id="OrgApplyInfoForm-issuingAuthority"
name="issuingAuthority"> name="issuingAuthority">
<a-input v-model:value="formData.issuingAuthority" :readOnly="true"></a-input> <a-input v-model:value="formData.issuingAuthority" placeholder="请输入签发机关" :readOnly="true"></a-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="12"> <a-col :span="12">
@ -77,40 +90,49 @@
<a-input placeholder="申请日期" v-model:value="formData.endTime" style="width: 100%" readOnly /> <a-input placeholder="申请日期" v-model:value="formData.endTime" style="width: 100%" readOnly />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="24"> <a-col :span="12">
<SectionDivider :title="'营业执照'" /> <a-form-item label="身份证正面" v-bind="validateInfos.cardZmPath" id="OrgApplyInfoForm-cardZmPath"
name="cardZmPath">
<JImageUpload :fileMax="1" v-model:value="formData.cardZmPath" :disabled="true"></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>
</a-form-item>
</a-col>
<a-col :span="24">
<SectionDivider :title="'企业资质'" />
</a-col> </a-col>
</a-row>
<a-row>
<a-col :span="12"> <a-col :span="12">
<a-form-item label="营业执照照片" v-bind="validateInfos.comBusinessLicense" <a-form-item label="营业执照照片" v-bind="validateInfos.comBusinessLicense"
id="OrgApplyInfoForm-comBusinessLicense" name="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" :disabled="true"></JImageUpload>
</a-form-item> </a-form-item>
</a-col> </a-col>
</a-row>
<a-row>
<a-col :span="12"> <a-col :span="12">
<a-form-item label="企业名称" v-bind="validateInfos.comName" id="OrgApplyInfoForm-comName" name="comName"> <a-form-item label="企业名称" v-bind="validateInfos.comName" id="OrgApplyInfoForm-comName" name="comName">
<a-input v-model:value="formData.comName" :readOnly="true"></a-input> <a-input v-model:value="formData.comName" placeholder="请输入企业名称" :readOnly="true"></a-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="12"> <a-col :span="12">
<a-form-item label="企业注册地址" v-bind="validateInfos.comRegisterAddress" <a-form-item label="企业注册地址" v-bind="validateInfos.comRegisterAddress"
id="OrgApplyInfoForm-comRegisterAddress" name="comRegisterAddress"> id="OrgApplyInfoForm-comRegisterAddress" name="comRegisterAddress">
<a-textarea v-model:value="formData.comRegisterAddress" :readOnly="true"></a-textarea> <a-textarea v-model:value="formData.comRegisterAddress" placeholder="请输入企业注册地址"
:readOnly="true"></a-textarea>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="12"> <a-col :span="12">
<a-form-item label="企业信用代码" v-bind="validateInfos.comCreditCode" id="OrgApplyInfoForm-comCreditCode" <a-form-item label="企业信用代码" v-bind="validateInfos.comCreditCode" id="OrgApplyInfoForm-comCreditCode"
name="comCreditCode"> name="comCreditCode">
<a-input v-model:value="formData.comCreditCode" :readOnly="true"></a-input> <a-input v-model:value="formData.comCreditCode" placeholder="请输入企业信用代码" :readOnly="true"></a-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="12"> <a-col :span="12">
<a-form-item label="企业法人" v-bind="validateInfos.comLegalPerson" id="OrgApplyInfoForm-comLegalPerson" <a-form-item label="企业法人" v-bind="validateInfos.comLegalPerson" id="OrgApplyInfoForm-comLegalPerson"
name="comLegalPerson"> name="comLegalPerson">
<a-input v-model:value="formData.comLegalPerson" :readOnly="true"></a-input> <a-input v-model:value="formData.comLegalPerson" placeholder="请输入企业法人" :readOnly="true"></a-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="24"> <a-col :span="24">
@ -125,56 +147,53 @@
<a-col :span="12"> <a-col :span="12">
<a-form-item label="机构地址" v-bind="validateInfos.orgAddress" id="OrgApplyInfoForm-orgAddress" <a-form-item label="机构地址" v-bind="validateInfos.orgAddress" id="OrgApplyInfoForm-orgAddress"
name="orgAddress"> name="orgAddress">
<a-textarea v-model:value="formData.orgAddress" :readOnly="true"></a-textarea> <a-textarea v-model:value="formData.orgAddress" placeholder="请输入机构地址" :readOnly="true"></a-textarea>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="12"> <a-col :span="12">
<a-form-item label="机构负责人" v-bind="validateInfos.orgLeader" id="OrgApplyInfoForm-orgLeader" <a-form-item label="机构负责人" v-bind="validateInfos.orgLeader" id="OrgApplyInfoForm-orgLeader"
name="orgLeader"> name="orgLeader">
<a-input v-model:value="formData.orgLeader" :readOnly="true"></a-input> <a-input v-model:value="formData.orgLeader" placeholder="请输入机构负责人" :readOnly="true"></a-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="12"> <a-col :span="12">
<a-form-item label="机构负责人电话" v-bind="validateInfos.orgLeaderPhone" id="OrgApplyInfoForm-orgLeaderPhone" <a-form-item label="机构负责人电话" v-bind="validateInfos.orgLeaderPhone" id="OrgApplyInfoForm-orgLeaderPhone"
name="orgLeaderPhone"> name="orgLeaderPhone">
<a-input v-model:value="formData.orgLeaderPhone" :readOnly="true"></a-input> <a-input v-model:value="formData.orgLeaderPhone" placeholder="请输入机构负责人电话" :readOnly="true"></a-input>
</a-form-item> </a-form-item>
</a-col> </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-form-item>
</a-col> -->
<a-col :span="12"> <a-col :span="12">
<a-form-item label="机构房屋性质" v-bind="validateInfos.orgPropertyType" id="OrgApplyInfoForm-orgPropertyType" <a-form-item label="机构房屋性质" v-bind="validateInfos.orgPropertyType" id="OrgApplyInfoForm-orgPropertyType"
name="orgPropertyType"> name="orgPropertyType">
<a-input v-model:value="formData.orgPropertyType" :readOnly="true"></a-input> <a-input v-model:value="formData.orgPropertyType" placeholder="请输入机构房屋性质" :readOnly="true"></a-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="12"> <a-col :span="12">
<a-form-item label="机构建筑面积" v-bind="validateInfos.orgBuildingArea" id="OrgApplyInfoForm-orgBuildingArea" <a-form-item label="机构建筑面积" v-bind="validateInfos.orgBuildingArea" id="OrgApplyInfoForm-orgBuildingArea"
name="orgBuildingArea"> name="orgBuildingArea">
<a-input v-model:value="formData.orgBuildingArea" addon-after="平方米" style="width: 100%" readOnly /> <a-input v-model:value="formData.orgBuildingArea" placeholder="请输入机构建筑面积" addon-after="m²"
style="width: 100%" readOnly />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="24"> <a-col :span="24">
<SectionDivider :title="'加盟审核'" /> <SectionDivider :title="'入驻审批'" />
</a-col> </a-col>
<a-col :span="12"> <a-col :span="12">
<a-form-item label="联系电话" v-bind="validateInfos.tel" id="OrgApplyInfoForm-tel" name="tel"> <a-form-item label="审批结果" v-bind="validateInfos.status" id="OrgApplyInfoForm-status" name="status">
<a-input v-model:value="formData.tel" placeholder="请输入联系电话" :readOnly="true"></a-input> <a-select v-model:value="formData.status" style="width: 200px" placeholder="请选择审批结果">
</a-form-item> <a-select-option value="1">待审核</a-select-option>
</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-form-item>
</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="2">审核通过</a-select-option> <a-select-option value="2">审核通过</a-select-option>
<a-select-option value="3">审核驳回</a-select-option> <a-select-option value="3">驳回</a-select-option>
</a-select> </a-select>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="12" v-show="formData.status == '3'"> <a-col :span="12">
<a-form-item label="驳回原因" v-bind="validateInfos.content" id="OrgApplyInfoForm-content" name="content"> <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" <a-textarea :autosize="{ minRows: 3 }" maxlength="50" show-count v-model:value="formData.content"
allow-clear placeholder="请输入驳回原因"></a-textarea> allow-clear placeholder="请输入驳回原因"></a-textarea>
@ -298,15 +317,12 @@ function add() {
function edit(record) { function edit(record) {
nextTick(() => { nextTick(() => {
resetFields(); resetFields();
let tmpData = {}; const tmpData = {};
Object.keys(formData).forEach((key) => { Object.keys(formData).forEach((key) => {
if (record.hasOwnProperty(key)) { if (record.hasOwnProperty(key)) {
tmpData[key] = record[key] tmpData[key] = record[key]
} }
}) })
if (tmpData.status != '2' && tmpData.status != '3') {
tmpData.status = null
}
//赋值 //赋值
Object.assign(formData, tmpData); Object.assign(formData, tmpData);
}); });

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

@ -6,19 +6,19 @@ import { getWeekMonthQuarterYear } from '/@/utils';
//列表数据 //列表数据
export const columns: BasicColumn[] = [ export const columns: BasicColumn[] = [
{ {
title: '企业名称', title: '姓名',
align: 'center', align: 'center',
dataIndex: 'comName', dataIndex: 'name',
}, },
{ {
title: '机构负责人', title: '性别',
align: 'center', align: 'center',
dataIndex: 'orgLeader', dataIndex: 'sex',
}, },
{ {
title: '机构负责人电话', title: '联系电话',
align: 'center', align: 'center',
dataIndex: 'orgLeaderPhone', dataIndex: 'tel',
}, },
{ {
title: '申请日期', title: '申请日期',
@ -26,17 +26,27 @@ export const columns: BasicColumn[] = [
dataIndex: 'createTime', dataIndex: 'createTime',
}, },
{ {
title: '房屋性质', title: '机构地址',
align: 'center',
dataIndex: 'orgAddress',
},
{
title: '机构负责人电话',
align: 'center',
dataIndex: 'orgLeaderPhone',
},
{
title: '机构房屋性质',
align: 'center', align: 'center',
dataIndex: 'orgPropertyType', dataIndex: 'orgPropertyType',
}, },
{ {
title: '面积', title: '机构建筑面积',
align: 'center', align: 'center',
dataIndex: 'orgBuildingArea', dataIndex: 'orgBuildingArea',
}, },
{ {
title: '审批意见', title: '审批状态',
align: 'center', align: 'center',
dataIndex: 'status_dictText', dataIndex: 'status_dictText',
}, },

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

@ -6,32 +6,28 @@
:wrapper-col="wrapperCol"> :wrapper-col="wrapperCol">
<a-row :gutter="24"> <a-row :gutter="24">
<a-col :lg="6"> <a-col :lg="6">
<a-form-item name="comName"> <a-form-item name="name">
<template #label><span title="企业名称">企业名称</span></template> <template #label><span title="姓名">姓名</span></template>
<JInput v-model:value="queryParam.comName" /> <JInput v-model:value="queryParam.name" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :lg="6"> <a-col :lg="6">
<a-form-item name="orgLeader"> <a-form-item name="tel">
<template #label><span title="机构负责人">机构负责人</span></template> <template #label><span title="联系电话">联系电话</span></template>
<JInput v-model:value="queryParam.orgLeader" /> <JInput v-model:value="queryParam.tel" />
</a-form-item>
</a-col>
<a-col :lg="6">
<a-form-item name="createTime">
<template #label><span title="申请日期">申请日期</span></template>
<a-range-picker value-format="YYYY-MM-DD" v-model:value="queryParam.createTime"
class="query-group-cust" />
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :lg="6"> <a-col :lg="6">
<a-form-item name="status"> <a-form-item name="status">
<template #label><span title="审批意见">审批意见</span></template> <template #label><span title="审批状态">审批状态</span></template>
<a-select v-model:value="queryParam.status" style="width: 200px" placeholder="请选择审批意见"> <j-dict-select-tag type="list" v-model:value="queryParam.status" dictCode="org_apply_status"
<a-select-option value="4">待审核</a-select-option> placeholder="请选择审批状态" allow-clear />
<a-select-option value="2">审核通过</a-select-option> </a-form-item>
<a-select-option value="5">审核驳回</a-select-option> </a-col>
</a-select> <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-form-item>
</a-col> </a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24"> <a-col :xl="6" :lg="7" :md="8" :sm="24">
@ -221,7 +217,11 @@ function searchReset() {
reload(); reload();
} }
let rangeField = 'createTime,'
let rangeField = 'orgBuildingArea,'
/** /**
* 设置范围查询条件 * 设置范围查询条件

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

@ -3,14 +3,14 @@
<a-form ref="formRef" layout="horizontal" :model="formData" :label-col="labelCol" :wrapper-col="wrapperCol"> <a-form ref="formRef" layout="horizontal" :model="formData" :label-col="labelCol" :wrapper-col="wrapperCol">
<a-row :gutter="16"> <a-row :gutter="16">
<a-col :span="12"> <a-col :span="12">
<a-form-item label="审批意见" name="status" v-bind="validateInfos.status"> <a-form-item label="审批结果" name="status" v-bind="validateInfos.status">
<a-select v-model:value="formData.status" style="width: 200px" placeholder="请选择审批意见"> <a-select v-model:value="formData.status" style="width: 200px" placeholder="请选择审批结果">
<a-select-option value="modifyPass">审核通过</a-select-option> <a-select-option value="modifyPass">审核通过</a-select-option>
<a-select-option value="modifyFail">审核驳回</a-select-option> <a-select-option value="modifyFail">驳回</a-select-option>
</a-select> </a-select>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :span="12" v-if="formData.status == 'modifyFail'"> <a-col :span="12">
<a-form-item label="驳回原因" name="content" v-bind="validateInfos.content"> <a-form-item label="驳回原因" name="content" v-bind="validateInfos.content">
<a-textarea :maxlength="50" show-count v-model:value="formData.content" <a-textarea :maxlength="50" show-count v-model:value="formData.content"
placeholder="请输入驳回原因（如驳回）" style="width: 100%" /> placeholder="请输入驳回原因（如驳回）" style="width: 100%" />
@ -119,13 +119,13 @@ const columns = [
ellipsis: true ellipsis: true
}, },
{ {
title: '变更前', title: '原始信息',
dataIndex: 'd2', dataIndex: 'd2',
key: 'd2', key: 'd2',
ellipsis: true ellipsis: true
}, },
{ {
title: '变更后', title: '变更信息',
dataIndex: 'd3', dataIndex: 'd3',
key: 'd3', key: 'd3',
ellipsis: true ellipsis: true

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

@ -194,7 +194,7 @@
<a-col :span="12"> <a-col :span="12">
<a-form-item label="机构建筑面积" v-bind="validateInfos.orgBuildingArea" id="OrgModifyInfoForm-orgBuildingArea" <a-form-item label="机构建筑面积" v-bind="validateInfos.orgBuildingArea" id="OrgModifyInfoForm-orgBuildingArea"
name="orgBuildingArea"> name="orgBuildingArea">
<a-input v-model:value="formData.orgBuildingArea" placeholder="请输入机构建筑面积" addon-after="平方米" style="width: 100%" /> <a-input v-model:value="formData.orgBuildingArea" placeholder="请输入机构建筑面积" addon-after="m²" style="width: 100%" />
</a-form-item> </a-form-item>
</a-col> </a-col>
</a-row> </a-row>