1、身份证正面改为人像面 反面改为国徽面

2、员工信息字段名、顺序调整
This commit is contained in:
1378012178@qq.com 2026-03-12 08:42:35 +08:00
parent 1d7421191e
commit 729cb9bd5b
14 changed files with 49 additions and 51 deletions

View File

@ -43,8 +43,8 @@ export const superQuerySchema = {
issuingAuthority: { title: '签发机关', order: 10, view: 'text', type: 'string' },
startTime: { title: '有效开始日期', order: 11, view: 'date', type: 'string' },
endTime: { title: '有效结束日期', order: 12, view: 'date', type: 'string' },
cardZmPath: { title: '身份证正面', order: 13, view: 'image', type: 'string' },
cardFmPath: { title: '身份证反面', order: 14, view: 'image', type: 'string' },
cardZmPath: { title: '人像面', order: 13, view: 'image', type: 'string' },
cardFmPath: { title: '国徽面', order: 14, view: 'image', type: 'string' },
maritalStatus: { title: '婚否', order: 15, view: 'text', type: 'string' },
height: { title: '身高', order: 16, view: 'text', type: 'string' },
weight: { title: '体重', order: 17, view: 'text', type: 'string' },

View File

@ -223,11 +223,11 @@ function handleAcquireIdenCard(record) {
function getTableAction(record) {
return [
{
label: '详情',
label: '员工详情',
onClick: handleDetail.bind(null, record),
},
{
label: '邀请',
label: '邀请员工',
onClick: handleInvite.bind(null, record),
},
// {

View File

@ -9,13 +9,13 @@
<SectionDivider :title="'基本信息'" />
</a-col>
<a-col :span="12">
<a-form-item label="身份证正面" v-bind="validateInfos.cardZmPath" id="NuEmployeesAdvisoryInfoForm-cardZmPath"
<a-form-item label="人像面" v-bind="validateInfos.cardZmPath" id="NuEmployeesAdvisoryInfoForm-cardZmPath"
name="cardZmPath">
<j-image-upload :fileMax="1" text="无" v-model:value="formData.cardZmPath" disabled></j-image-upload>
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="身份证反面" v-bind="validateInfos.cardFmPath" id="NuEmployeesAdvisoryInfoForm-cardFmPath"
<a-form-item label="国徽面" v-bind="validateInfos.cardFmPath" id="NuEmployeesAdvisoryInfoForm-cardFmPath"
name="cardFmPath">
<j-image-upload :fileMax="1" text="无" v-model:value="formData.cardFmPath" disabled></j-image-upload>
</a-form-item>

View File

@ -21,13 +21,13 @@
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="性别" v-bind="validateInfos.sex" id="NuEmployeesAdvisoryInfoForm-sex" name="sex">
<a-form-item label="员工性别" v-bind="validateInfos.sex" id="NuEmployeesAdvisoryInfoForm-sex" name="sex">
<a-input v-model:value="formData.sex" disabled></a-input>
<!-- {{ formData.sex }} -->
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="年龄">
<a-form-item label="员工年龄">
{{ handleComputedAge(formData.birthDate) }}
</a-form-item>
</a-col>
@ -46,13 +46,6 @@
<!-- {{ formData.national }} -->
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="户籍所在地" v-bind="validateInfos.idCardAddress"
id="NuEmployeesAdvisoryInfoForm-idCardAddress" name="idCardAddress">
<a-textarea v-model:value="formData.idCardAddress" disabled :autosize="true"></a-textarea>
<!-- {{ formData.idCardAddress }} -->
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="身份证号" v-bind="validateInfos.idCard" id="NuEmployeesAdvisoryInfoForm-idCard"
name="idCard">
@ -68,14 +61,14 @@
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="身高" v-bind="validateInfos.height" id="NuEmployeesAdvisoryInfoForm-height"
<a-form-item label="身高(cm)" v-bind="validateInfos.height" id="NuEmployeesAdvisoryInfoForm-height"
name="height">
<a-input v-model:value="formData.height" disabled></a-input>
<!-- {{ formData.height }} -->
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="体重" v-bind="validateInfos.weight" id="NuEmployeesAdvisoryInfoForm-weight"
<a-form-item label="体重(kg)" v-bind="validateInfos.weight" id="NuEmployeesAdvisoryInfoForm-weight"
name="weight">
<a-input v-model:value="formData.weight" disabled></a-input>
<!-- {{ formData.weight }} -->
@ -95,7 +88,13 @@
<!-- {{ formData.politicalAppearance }} -->
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="户籍所在地" v-bind="validateInfos.idCardAddress"
id="NuEmployeesAdvisoryInfoForm-idCardAddress" name="idCardAddress">
<a-textarea v-model:value="formData.idCardAddress" disabled :autosize="true"></a-textarea>
<!-- {{ formData.idCardAddress }} -->
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="紧急联系人" v-bind="validateInfos.contactName" id="NuEmployeesAdvisoryInfoForm-contactName"
name="contactName">
@ -117,13 +116,6 @@
<!-- {{ formData.contactRelationship }} -->
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="现住址" v-bind="validateInfos.currentAddress"
id="NuEmployeesAdvisoryInfoForm-currentAddress" name="currentAddress">
<a-textarea v-model:value="formData.currentAddress" disabled :autosize="true"></a-textarea>
<!-- {{ formData.currentAddress }} -->
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="户口性质" v-bind="validateInfos.hukouType" id="NuEmployeesAdvisoryInfoForm-hukouType"
name="hukouType">
@ -131,6 +123,13 @@
<!-- {{ formData.hukouType }} -->
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="现住址" v-bind="validateInfos.currentAddress"
id="NuEmployeesAdvisoryInfoForm-currentAddress" name="currentAddress">
<a-textarea v-model:value="formData.currentAddress" disabled :autosize="true"></a-textarea>
<!-- {{ formData.currentAddress }} -->
</a-form-item>
</a-col>
</a-row>
<a-row class="card-class">
<a-col :span="24" style="border-bottom: 2px solid #f7f7f7; margin-bottom: 14px;">

View File

@ -1,7 +1,6 @@
<template>
<a-drawer :title="title" width="1000px" v-model:visible="visible" :closable="true"
:footer-style="{ textAlign: 'right' }" @close="handleCancel">
:footer-style="{ textAlign: 'right' }" :bodyStyle="{ padding: '0px' }" @close="handleCancel">
<NuEmployeesAdvisoryInfoForm ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></NuEmployeesAdvisoryInfoForm>
<template #footer>
<a-button type="primary" style="margin-right: 8px" @click="handleCancel">关闭</a-button>
@ -38,7 +37,7 @@
* @param record
*/
function edit(record) {
title.value = disableSubmit.value ? '详情' : '编辑';
title.value = disableSubmit.value ? '员工详情' : '编辑';
visible.value = true;
nextTick(() => {
registerForm.value.edit(record);

View File

@ -115,13 +115,13 @@
<SectionDivider :title="'申请人身份证'" />
</a-col>
<a-col :span="12">
<a-form-item label="身份证正面" v-bind="validateInfos.idCardPositive" id="EmployeesApplyForm-idCardPositive"
<a-form-item label="人像面" v-bind="validateInfos.idCardPositive" id="EmployeesApplyForm-idCardPositive"
name="idCardPositive">
<j-image-upload :fileMax="0" v-model:value="formData.idCardPositive"></j-image-upload>
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="身份证反面" v-bind="validateInfos.idCardNegative" id="EmployeesApplyForm-idCardNegative"
<a-form-item label="国徽面" v-bind="validateInfos.idCardNegative" id="EmployeesApplyForm-idCardNegative"
name="idCardNegative">
<j-image-upload :fileMax="0" v-model:value="formData.idCardNegative"></j-image-upload>
</a-form-item>

View File

@ -113,8 +113,8 @@ export const applyObj = {
emergencyTel: '紧急联系人电话',
emergencyRelationship: '与本人关系',
hukouNature: '户口性质',
idCardPositive: '身份证正面',
idCardNegative: '身份证反面',
idCardPositive: '人像面',
idCardNegative: '国徽面',
healthCertificatePositive: '健康证正面',
healthCertificateNegative: '健康证反面',
bankPositive: '银行卡正面',

View File

@ -166,7 +166,7 @@
<a-tab-pane key="1" tab="身份证">
<a-row>
<a-col :span="12">
<a-form-item label="身份证正面" v-bind="validateInfos.idCardPositive"
<a-form-item label="人像面" v-bind="validateInfos.idCardPositive"
id="BizEmployeesInfoForm-idCardPositive" name="idCardPositive">
<j-image-upload v-if="!!formData.idCardPositive" :fileMax="1" :bizPath="`employeesZzxx`"
:value="opeMediaAddress + formData.idCardPositive" disabled></j-image-upload>
@ -174,7 +174,7 @@
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="身份证反面" v-bind="validateInfos.idCardNegative"
<a-form-item label="国徽面" v-bind="validateInfos.idCardNegative"
id="BizEmployeesInfoForm-idCardNegative" name="idCardNegative">
<j-image-upload v-if="!!formData.idCardNegative" :fileMax="1" :bizPath="`employeesZzxx`"
:value="opeMediaAddress + formData.idCardNegative" disabled></j-image-upload>

View File

@ -115,13 +115,13 @@
<SectionDivider :title="'申请人身份证'" />
</a-col>
<a-col :span="12">
<a-form-item label="身份证正面" v-bind="validateInfos.idCardPositive" id="EmployeesApplyForm-idCardPositive"
<a-form-item label="人像面" v-bind="validateInfos.idCardPositive" id="EmployeesApplyForm-idCardPositive"
name="idCardPositive">
<j-image-upload :fileMax="0" v-model:value="formData.idCardPositive"></j-image-upload>
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="身份证反面" v-bind="validateInfos.idCardNegative" id="EmployeesApplyForm-idCardNegative"
<a-form-item label="国徽面" v-bind="validateInfos.idCardNegative" id="EmployeesApplyForm-idCardNegative"
name="idCardNegative">
<j-image-upload :fileMax="0" v-model:value="formData.idCardNegative"></j-image-upload>
</a-form-item>

View File

@ -124,13 +124,13 @@ export const columns: BasicColumn[] = [
dataIndex: 'content'
},
{
title: '身份证正面',
title: '人像面',
align: "center",
dataIndex: 'idCardPositive',
customRender: render.renderImage,
},
{
title: '身份证反面',
title: '国徽面',
align: "center",
dataIndex: 'idCardNegative',
customRender: render.renderImage,
@ -219,8 +219,8 @@ export const superQuerySchema = {
emergencyRelationship: {title: '紧急联系人与本人关系',order: 19,view: 'text', type: 'string',},
hukouNature: {title: '户口性质',order: 20,view: 'radio', type: 'string',dictCode: 'hukou_nature',},
content: {title: '备注',order: 21,view: 'text', type: 'string',},
idCardPositive: {title: '身份证正面',order: 22,view: 'image', type: 'string',},
idCardNegative: {title: '身份证反面',order: 23,view: 'image', type: 'string',},
idCardPositive: {title: '人像面',order: 22,view: 'image', type: 'string',},
idCardNegative: {title: '国徽面',order: 23,view: 'image', type: 'string',},
contractPositive: {title: '合同正面',order: 24,view: 'image', type: 'string',},
contractNegative: {title: '合同反面',order: 25,view: 'image', type: 'string',},
healthCertificatePositive: {title: '健康证正面',order: 26,view: 'image', type: 'string',},

View File

@ -177,14 +177,14 @@
<a-tab-pane key="1" tab="身份证">
<a-row>
<a-col :span="12">
<a-form-item label="身份证正面" v-bind="validateInfos.idCardPositive"
<a-form-item label="人像面" v-bind="validateInfos.idCardPositive"
id="BizEmployeesInfoForm-idCardPositive" name="idCardPositive">
<j-image-upload :fileMax="0" :bizPath="`employeesZzxx`"
v-model:value="formData.idCardPositive"></j-image-upload>
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="身份证反面" v-bind="validateInfos.idCardNegative"
<a-form-item label="国徽面" v-bind="validateInfos.idCardNegative"
id="BizEmployeesInfoForm-idCardNegative" name="idCardNegative">
<j-image-upload :fileMax="0" :bizPath="`employeesZzxx`"
v-model:value="formData.idCardNegative"></j-image-upload>

View File

@ -186,7 +186,7 @@
<a-tab-pane key="1" tab="身份证">
<a-row>
<a-col :span="12">
<a-form-item label="身份证正面" v-bind="validateInfos.idCardPositive"
<a-form-item label="人像面" v-bind="validateInfos.idCardPositive"
id="BizEmployeesInfoForm-idCardPositive" name="idCardPositive">
<j-image-upload v-if="!!formData.idCardPositive" :fileMax="1"
:bizPath="`employeesZzxx`"
@ -196,7 +196,7 @@
</a-form-item>
</a-col>
<a-col :span="12">
<a-form-item label="身份证反面" v-bind="validateInfos.idCardNegative"
<a-form-item label="国徽面" v-bind="validateInfos.idCardNegative"
id="BizEmployeesInfoForm-idCardNegative" name="idCardNegative">
<j-image-upload v-if="!!formData.idCardNegative" :fileMax="1"
:bizPath="`employeesZzxx`"

View File

@ -209,8 +209,8 @@ export const superQuerySchema = {
dateOfBirth: { title: '出生日期', order: 5, view: 'datetime', type: 'string' },
national: { title: '民族', order: 6, view: 'text', type: 'string' },
houseAddress: { title: '户籍所在地', order: 7, view: 'textarea', type: 'string' },
idCardPositive: { title: '身份证正面', order: 8, view: 'image', type: 'string' },
idCardNegative: { title: '身份证反面', order: 9, view: 'image', type: 'string' },
idCardPositive: { title: '人像面', order: 8, view: 'image', type: 'string' },
idCardNegative: { title: '国徽面', order: 9, view: 'image', type: 'string' },
guardianName: { title: '监护人姓名', order: 10, view: 'text', type: 'string' },
relationship: { title: '关系', order: 11, view: 'text', type: 'string' },
guardianIdCard: { title: '监护人身份证号', order: 12, view: 'text', type: 'string' },
@ -239,8 +239,8 @@ export const applyObj = {
educationLevel: '文化程度',
maritalStatus: '婚姻状况',
religiousBeliefs: '宗教信仰',
idCardPositive: '身份证正面',
idCardNegative: '身份证反面',
idCardPositive: '人像面',
idCardNegative: '国徽面',
accountBookHimself: '户口本本人页',
frontMedical: '医保卡正面',
negaticeMedical: '医保卡反面',
@ -273,7 +273,7 @@ export const applyObj = {
elderModifyStatus: '长者信息变更状态 1修改申请中 2通过 3驳回',
elderModifyContent: '长者信息变更驳回原因',
elderModifyId: '长者变更信息对应子表id nu_biz_elder_modify_info.id',
guardianIdCardPositive: '监护人身份证面',
guardianIdCardPositive: '监护人身份证人像面',
sndjName: '失能等级',
jfztName: '缴费状态',
};

View File

@ -17,7 +17,7 @@
<div
style="height:44px; display: flex; justify-content: space-between; align-items: center; padding: 14px 24px 0 14px; flex-shrink: 0; margin-bottom: 14px;">
<div style="font-size: 16px;font-weight: bold;">已选服务指令</div>
<div>
<div v-show="!disableSubmit">
<a-button type="primary" size="small" @click="handleAddDirectives">添加服务指令</a-button>
</div>
</div>
@ -50,7 +50,7 @@
style="font-weight: 500; color: #333; font-size: 15px; flex: 1; word-break: break-word; line-height: 1.4;">
{{ directive.directiveName }}
</div>
<div @click.stop style="flex-shrink: 0;">
<div @click.stop style="flex-shrink: 0;" v-show="!disableSubmit">
<a-popconfirm title="是否确认移除?" ok-text="确认" cancel-text="取消" @confirm="deleteDirective(directive.id)">
<a-button class="hover-red-hand" type="link" style="color: grey; padding: 0; height: auto;"
preIcon="ic:twotone-remove-circle-outline"></a-button>