Merge branch 'master' of http://47.115.223.229:8888/yangjun/nursing_unit_vue
# Conflicts: # src/views/invoicing/warehouseMaterialInfo/components/CkfzrForm.vue
This commit is contained in:
commit
8c6c28ba10
|
|
@ -1,6 +1,6 @@
|
|||
<template>
|
||||
<a-spin :spinning="confirmLoading">
|
||||
<JFormContainer :disabled="disabled">
|
||||
<JFormContainer :disabled="true">
|
||||
<template #detail>
|
||||
<a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol"
|
||||
name="EmployeesApplyForm">
|
||||
|
|
@ -153,7 +153,7 @@
|
|||
</a-form>
|
||||
</template>
|
||||
</JFormContainer>
|
||||
<JFormContainer :disabled="disabled">
|
||||
<JFormContainer>
|
||||
<template #detail>
|
||||
<a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol2" :wrapperCol="wrapperCol2"
|
||||
name="EmployeesApplyForm">
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@
|
|||
</div>
|
||||
<a-row>
|
||||
<a-col v-for="(item, index) in dataList" :key="index"
|
||||
:style="{ 'padding-right': (index + 1) % 4 === 0 ? '0px' : '14px' }" :xs="24" :sm="24" :md="12" :lg="12" :xl="8"
|
||||
:style="{ 'padding-right': (index + 1) % 4 === 0 ? '0px' : '14px','margin-bottom':'14px' }" :xs="24" :sm="24" :md="12" :lg="12" :xl="8"
|
||||
:xxl="6">
|
||||
<a-row style="padding: 14px;background-color: white;border-radius: 10px;height: 230px;">
|
||||
<a-col :span="4" style="padding-left: 8px;">
|
||||
|
|
|
|||
|
|
@ -1,74 +1,73 @@
|
|||
<template>
|
||||
<a-spin :spinning="confirmLoading">
|
||||
<JFormContainer :disabled="disabled">
|
||||
<JFormContainer :disabled="true">
|
||||
<template #detail>
|
||||
<a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol"
|
||||
name="EmployeesApplyForm">
|
||||
<a-row>
|
||||
<a-col :span="24">
|
||||
<a-row class="card-class">
|
||||
<a-col :span="24" style="border-bottom: 2px solid #f7f7f7; margin-bottom: 14px;">
|
||||
<SectionDivider :title="'基本信息'" />
|
||||
</a-col>
|
||||
</a-row>
|
||||
<a-row>
|
||||
<a-col :span="6" :push="2">
|
||||
<a-form-item label="头像" v-bind="validateInfos.headPath" id="BizEmployeesInfoForm-headPath"
|
||||
name="headPath">
|
||||
<j-image-upload :fileMax="1" :bizPath="`employeesHead`" text="头像"
|
||||
v-model:value="formData.headPath"></j-image-upload>
|
||||
</a-form-item>
|
||||
<a-col :span="24">
|
||||
<a-col :span="12">
|
||||
<a-form-item label="头像" v-bind="validateInfos.headPath"
|
||||
id="BizEmployeesInfoForm-headPath" name="headPath">
|
||||
<j-image-upload :fileMax="1" :bizPath="`employeesHead`" text="头像"
|
||||
v-model:value="formData.headPath"></j-image-upload>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
</a-col>
|
||||
</a-row>
|
||||
<a-row>
|
||||
<a-col :span="12">
|
||||
<a-form-item label="姓名" v-bind="validateInfos.name" id="EmployeesApplyForm-name"
|
||||
name="name">
|
||||
<!-- <a-input v-model:value="formData.name" placeholder="请输入姓名" disabled allow-clear></a-input> -->
|
||||
<span>{{ formData.name }}</span>
|
||||
<a-input v-model:value="formData.name" placeholder="请输入姓名" disabled
|
||||
allow-clear></a-input>
|
||||
<!-- <span>{{ formData.name }}</span> -->
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="12">
|
||||
<a-form-item label="联系电话" v-bind="validateInfos.tel" id="EmployeesApplyForm-tel" name="tel">
|
||||
<!-- <a-input v-model:value="formData.tel" placeholder="请输入联系电话" disabled allow-clear></a-input> -->
|
||||
<span>{{ formData.tel }}</span>
|
||||
<a-input v-model:value="formData.tel" placeholder="请输入联系电话" disabled
|
||||
allow-clear></a-input>
|
||||
<!-- <span>{{ formData.tel }}</span> -->
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="12">
|
||||
<a-form-item label="性别" v-bind="validateInfos.sex" id="EmployeesApplyForm-sex" name="sex">
|
||||
<a-input v-model:value="formData.sex" placeholder="请输入性别" disabled
|
||||
allow-clear></a-input>
|
||||
<!-- <j-dict-select-tag type='radio' v-model:value="formData.sex" dictCode="sex" placeholder="请选择性别" disabled
|
||||
allow-clear /> -->
|
||||
<span>{{ formData.sex }}</span>
|
||||
<!-- <span>{{ formData.sex }}</span> -->
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="12">
|
||||
<a-form-item label="年龄" v-bind="validateInfos.sex" id="EmployeesApplyForm-sex" name="sex">
|
||||
<span> {{ handleComputedAge(formData.dateOfBirth) }}</span>
|
||||
<a-input v-model:value="ageVal" placeholder="请输入年龄" disabled allow-clear></a-input>
|
||||
<!-- <span> {{ handleComputedAge(formData.dateOfBirth) }}</span> -->
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="12">
|
||||
<a-form-item label="出生日期" v-bind="validateInfos.dateOfBirth"
|
||||
id="EmployeesApplyForm-dateOfBirth" name="dateOfBirth">
|
||||
<!-- <a-date-picker placeholder="请选择出生日期" v-model:value="formData.dateOfBirth" value-format="YYYY-MM-DD"
|
||||
style="width: 100%" disabled allow-clear /> -->
|
||||
<span>{{ formData.dateOfBirth }}</span>
|
||||
<a-date-picker placeholder="请选择出生日期" v-model:value="formData.dateOfBirth"
|
||||
value-format="YYYY-MM-DD" style="width: 100%" disabled allow-clear />
|
||||
<!-- <span>{{ formData.dateOfBirth }}</span> -->
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="12">
|
||||
<a-form-item label="民族" v-bind="validateInfos.national" id="EmployeesApplyForm-national"
|
||||
name="national">
|
||||
<!-- <a-input v-model:value="formData.national" placeholder="请输入民族" disabled allow-clear></a-input> -->
|
||||
<span>{{ formData.national }}</span>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="12">
|
||||
<a-form-item label="家庭住址" v-bind="validateInfos.address" id="EmployeesApplyForm-address"
|
||||
name="address">
|
||||
<!-- <a-textarea v-model:value="formData.address" :rows="4" placeholder="请输入家庭住址" disabled /> -->
|
||||
<span>{{ formData.address }}</span>
|
||||
<a-input v-model:value="formData.national" placeholder="请输入民族" disabled
|
||||
allow-clear></a-input>
|
||||
<!-- <span>{{ formData.national }}</span> -->
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="12">
|
||||
<a-form-item label="身份证号">
|
||||
<span>{{ formData.idCard }}</span>
|
||||
<a-input v-model:value="formData.idCard" placeholder="请输入身份证号" disabled
|
||||
allow-clear></a-input>
|
||||
<!-- <span>{{ formData.idCard }}</span> -->
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="12">
|
||||
|
|
@ -76,21 +75,25 @@
|
|||
id="EmployeesApplyForm-marriedOrNot" name="marriedOrNot">
|
||||
<!-- <j-dict-select-tag type='radio' v-model:value="formData.marriedOrNot" dictCode="married_or_not"
|
||||
placeholder="请选择婚否" disabled allow-clear /> -->
|
||||
<span>{{ formData.marriedOrNot }}</span>
|
||||
<a-input v-model:value="formData.marriedOrNot" placeholder="请输入婚否" disabled
|
||||
allow-clear></a-input>
|
||||
<!-- <span>{{ formData.marriedOrNot }}</span> -->
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="12">
|
||||
<a-form-item label="身高" v-bind="validateInfos.height" id="EmployeesApplyForm-height"
|
||||
<a-form-item label="身高(cm)" v-bind="validateInfos.height" id="EmployeesApplyForm-height"
|
||||
name="height">
|
||||
<!-- <a-input-number v-model:value="formData.height" placeholder="请输入身高" style="width: 100%" disabled /> -->
|
||||
<span>{{ formData.height }}cm</span>
|
||||
<a-input-number v-model:value="formData.height" placeholder="请输入身高" style="width: 100%"
|
||||
disabled />
|
||||
<!-- <span>{{ formData.height }}cm</span> -->
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="12">
|
||||
<a-form-item label="体重" v-bind="validateInfos.weight" id="EmployeesApplyForm-weight"
|
||||
<a-form-item label="体重(kg)" v-bind="validateInfos.weight" id="EmployeesApplyForm-weight"
|
||||
name="weight">
|
||||
<!-- <a-input-number v-model:value="formData.weight" placeholder="请输入体重" style="width: 100%" disabled /> -->
|
||||
<span>{{ formData.weight }}kg</span>
|
||||
<a-input-number v-model:value="formData.weight" placeholder="请输入体重" style="width: 100%"
|
||||
disabled />
|
||||
<!-- <span>{{ formData.weight }}kg</span> -->
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<!-- <a-col :span="12">
|
||||
|
|
@ -106,7 +109,9 @@
|
|||
id="EmployeesApplyForm-healthStatus" name="healthStatus">
|
||||
<!-- <j-dict-select-tag type='radio' v-model:value="formData.healthStatus" dictCode="health_status" disabled
|
||||
placeholder="请选择健康状况" allow-clear /> -->
|
||||
<span>{{ formData.healthStatus }}</span>
|
||||
<a-input v-model:value="formData.healthStatus" placeholder="请输入健康状况" style="width: 100%"
|
||||
disabled />
|
||||
<!-- <span>{{ formData.healthStatus }}</span> -->
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="12">
|
||||
|
|
@ -114,37 +119,41 @@
|
|||
id="EmployeesApplyForm-politicalAppearance" name="politicalAppearance">
|
||||
<!-- <j-dict-select-tag v-model:value="formData.politicalAppearance" dictCode="political_appearance" disabled
|
||||
placeholder="请选择政治面貌" allow-clear /> -->
|
||||
<span>{{ formData.politicalAppearance }}</span>
|
||||
<a-input v-model:value="formData.politicalAppearance" placeholder="请输入政治面貌"
|
||||
style="width: 100%" disabled />
|
||||
<!-- <span>{{ formData.politicalAppearance }}</span> -->
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="12">
|
||||
<a-form-item label="户籍所在地" v-bind="validateInfos.houseAddress"
|
||||
id="EmployeesApplyForm-houseAddress" name="houseAddress">
|
||||
<!-- <a-input v-model:value="formData.houseAddress" placeholder="请输入户籍所在地" disabled allow-clear></a-input> -->
|
||||
<span>{{ formData.houseAddress }}</span>
|
||||
<a-input v-model:value="formData.houseAddress" placeholder="请输入户籍所在地" disabled
|
||||
allow-clear></a-input>
|
||||
<!-- <span>{{ formData.houseAddress }}</span> -->
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="12">
|
||||
<a-form-item label="紧急联系人" v-bind="validateInfos.emergencyContact"
|
||||
id="EmployeesApplyForm-emergencyContact" name="emergencyContact">
|
||||
<!-- <a-input v-model:value="formData.emergencyContact" placeholder="请输入紧急联系人" disabled
|
||||
allow-clear></a-input> -->
|
||||
<span>{{ formData.emergencyContact }}</span>
|
||||
<a-input v-model:value="formData.emergencyContact" placeholder="请输入紧急联系人" disabled
|
||||
allow-clear></a-input>
|
||||
<!-- <span>{{ formData.emergencyContact }}</span> -->
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="12">
|
||||
<a-form-item label="紧急联系人电话" v-bind="validateInfos.emergencyTel"
|
||||
id="EmployeesApplyForm-emergencyTel" name="emergencyTel">
|
||||
<!-- <a-input v-model:value="formData.emergencyTel" placeholder="请输入紧急联系人电话" disabled allow-clear></a-input> -->
|
||||
<span>{{ formData.emergencyTel }}</span>
|
||||
<a-input v-model:value="formData.emergencyTel" placeholder="请输入紧急联系人电话" disabled
|
||||
allow-clear></a-input>
|
||||
<!-- <span>{{ formData.emergencyTel }}</span> -->
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="12">
|
||||
<a-form-item label="与本人关系" v-bind="validateInfos.emergencyRelationship"
|
||||
id="EmployeesApplyForm-emergencyRelationship" name="emergencyRelationship">
|
||||
<!-- <a-input v-model:value="formData.emergencyRelationship" placeholder="请输入紧急联系人与本人关系" disabled
|
||||
allow-clear></a-input> -->
|
||||
<span>{{ formData.emergencyRelationship }}</span>
|
||||
<a-input v-model:value="formData.emergencyRelationship" placeholder="请输入紧急联系人与本人关系"
|
||||
disabled allow-clear></a-input>
|
||||
<!-- <span>{{ formData.emergencyRelationship }}</span> -->
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="12">
|
||||
|
|
@ -152,13 +161,17 @@
|
|||
id="EmployeesApplyForm-hukouNature" name="hukouNature">
|
||||
<!-- <j-dict-select-tag type='radio' v-model:value="formData.hukouNature" dictCode="hukou_nature" disabled
|
||||
placeholder="请选择户口性质" allow-clear /> -->
|
||||
<span>{{ formData.hukouNature }}</span>
|
||||
<a-input v-model:value="formData.hukouNature" placeholder="请输入户口性质" disabled
|
||||
allow-clear></a-input>
|
||||
<!-- <span>{{ formData.hukouNature }}</span> -->
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="12">
|
||||
<a-form-item label="现住址" v-bind="validateInfos.currentAddress"
|
||||
id="EmployeesApplyForm-currentAddress" name="currentAddress">
|
||||
<span>{{ formData.currentAddress }}</span>
|
||||
<a-input v-model:value="formData.currentAddress" placeholder="请输入现住址" disabled
|
||||
allow-clear></a-input>
|
||||
<!-- <span>{{ formData.currentAddress }}</span> -->
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
</a-row>
|
||||
|
|
@ -169,8 +182,8 @@
|
|||
<template #detail>
|
||||
<a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol2" :wrapperCol="wrapperCol2"
|
||||
name="EmployeesApplyForm">
|
||||
<a-row>
|
||||
<a-col :span="24">
|
||||
<a-row class="card-class">
|
||||
<a-col :span="24" style="border-bottom: 2px solid #f7f7f7; margin-bottom: 14px;">
|
||||
<SectionDivider :title="'证件信息'" />
|
||||
</a-col>
|
||||
<a-col :span="23" :push="1">
|
||||
|
|
@ -307,6 +320,7 @@ const opeMediaAddress = import.meta.env.VITE_OPE_MEDIA_ADDRESS
|
|||
const formRef = ref();
|
||||
const useForm = Form.useForm;
|
||||
const emit = defineEmits(['register', 'ok']);
|
||||
const ageVal = ref()
|
||||
const formData = reactive<Record<string, any>>({
|
||||
id: '',
|
||||
name: '',
|
||||
|
|
@ -382,6 +396,7 @@ function add() {
|
|||
* 编辑
|
||||
*/
|
||||
function edit(record) {
|
||||
ageVal.value = handleComputedAge(record.dateOfBirth)
|
||||
nextTick(() => {
|
||||
resetFields();
|
||||
const tmpData = {};
|
||||
|
|
@ -481,4 +496,17 @@ defineExpose({
|
|||
.antd-modal-form {
|
||||
// padding: 14px;
|
||||
}
|
||||
|
||||
.card-class {
|
||||
padding-top: 24px;
|
||||
padding-bottom: 24px;
|
||||
padding-left: 14px;
|
||||
padding-right: 14px;
|
||||
// background-color: rgba(255, 255, 255, 0.9);
|
||||
background-color: #fcfdff;
|
||||
border-radius: 10px;
|
||||
// box-shadow: rgba(0, 0, 0, 0.1) 0px 2px 12px;
|
||||
margin-bottom: 14px;
|
||||
|
||||
}
|
||||
</style>
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
<BizEmployeesInfoForm ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></BizEmployeesInfoForm>
|
||||
</j-modal> -->
|
||||
<a-drawer :title="title" width="70vw" :visible="visible" :closable="true" :footer-style="{ textAlign: 'right' }"
|
||||
@close="handleCancel">
|
||||
:bodyStyle="{ padding: '14px' }" @close="handleCancel">
|
||||
<template #footer>
|
||||
<a-button type="primary" style="margin-right: 8px" @click="handleCancel">关闭</a-button>
|
||||
<a-button type="primary" @click="handleOk" v-if="!disableSubmit">确认</a-button>
|
||||
|
|
|
|||
|
|
@ -10,13 +10,13 @@
|
|||
</a-col>
|
||||
<a-col :span="12">
|
||||
<a-form-item label="NUID" v-bind="validateInfos.nuId" id="ElderInfoForm-nuId" name="nuId">
|
||||
<a-input v-model:value="formData.nuId" placeholder="请输入护理单元" ></a-input>
|
||||
<a-input v-model:value="formData.nuId" allow-clear></a-input>
|
||||
<!-- <span>{{ formData.nuId }}</span> -->
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="12">
|
||||
<a-form-item label="护理单元">
|
||||
<a-input v-model:value="formData.nuId_dictText" placeholder="请输入护理单元" ></a-input>
|
||||
<a-input v-model:value="formData.nuId_dictText" allow-clear></a-input>
|
||||
<!-- <j-dict-select-tag type='list' v-model:value="formData.nuId" :dictCode="`nu_base_info,nu_name,nu_id`"
|
||||
placeholder="请选择分类标签" allowClear @upDictCode="upNuNameFunc" />-->
|
||||
<!-- <span>{{ formData.nuId_dictText }}</span> -->
|
||||
|
|
@ -24,42 +24,40 @@
|
|||
</a-col>
|
||||
<a-col :span="12">
|
||||
<a-form-item label="姓名" v-bind="validateInfos.name" id="ElderInfoForm-name" name="name">
|
||||
<a-input v-model:value="formData.name" placeholder="请输入姓名" ></a-input>
|
||||
<a-input v-model:value="formData.name" allow-clear></a-input>
|
||||
<!-- <span>{{ formData.name }}</span> -->
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="12">
|
||||
<a-form-item label="性别" v-bind="validateInfos.sex" id="ElderInfoForm-sex" name="sex">
|
||||
<a-input v-model:value="formData.sex" placeholder="请输入性别" ></a-input>
|
||||
<a-input v-model:value="formData.sex" allow-clear></a-input>
|
||||
<!-- <span>{{ formData.sex }}</span> -->
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="12">
|
||||
<a-form-item label="身份证号码" v-bind="validateInfos.idCard" id="ElderInfoForm-idCard" name="idCard">
|
||||
<a-input v-model:value="formData.idCard" placeholder="请输入身份证号码" ></a-input>
|
||||
<a-input v-model:value="formData.idCard" allow-clear></a-input>
|
||||
<!-- <span>{{ formData.idCard }}</span> -->
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="12">
|
||||
<a-form-item label="出生日期" v-bind="validateInfos.dateOfBirth" id="ElderInfoForm-dateOfBirth"
|
||||
name="dateOfBirth">
|
||||
<!-- <a-date-picker placeholder="请选择出生日期" v-model:value="formData.dateOfBirth" showTime
|
||||
value-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" /> -->
|
||||
<a-input v-model:value="formData.dateOfBirth" placeholder="出生日期" ></a-input>
|
||||
<a-date-picker v-model:value="formData.dateOfBirth" value-format="YYYY-MM-DD " style="width: 100%"
|
||||
allow-clear />
|
||||
<!-- <span>{{ formData.dateOfBirth }}</span> -->
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="12">
|
||||
<a-form-item label="民族" v-bind="validateInfos.national" id="ElderInfoForm-national" name="national">
|
||||
<a-input v-model:value="formData.national" placeholder="请输入民族" ></a-input>
|
||||
<a-input v-model:value="formData.national" allow-clear></a-input>
|
||||
<!-- <span>{{ formData.national }}</span> -->
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="12">
|
||||
<a-form-item label="住址" v-bind="validateInfos.houseAddress" id="ElderInfoForm-houseAddress"
|
||||
name="houseAddress">
|
||||
<!-- <a-textarea v-model:value="formData.houseAddress" :rows="4" placeholder="请输入户籍所在地" /> -->
|
||||
<a-input v-model:value="formData.houseAddress" placeholder="请输入户籍所在地" ></a-input>
|
||||
<a-textarea v-model:value="formData.houseAddress" :autosize="{ minRows: 1 }" />
|
||||
<!-- <span>{{ formData.houseAddress }}</span> -->
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
|
|
@ -70,50 +68,52 @@
|
|||
</a-col>
|
||||
<a-col :span="24">
|
||||
<a-col :span="12">
|
||||
<a-form-item label="身份证正面" v-bind="validateInfos.guardianIdCardPositive" id="ElderInfoForm-guardianIdCardPositive"
|
||||
name="guardianIdCardPositive">
|
||||
<j-image-upload :fileMax="1" :value="opeMediaAddress + formData.guardianIdCardPositive"></j-image-upload>
|
||||
<a-form-item label="身份证正面" v-bind="validateInfos.guardianIdCardPositive"
|
||||
id="ElderInfoForm-guardianIdCardPositive" name="guardianIdCardPositive">
|
||||
<j-image-upload :fileMax="1"
|
||||
:value="opeMediaAddress + formData.guardianIdCardPositive"></j-image-upload>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
</a-col>
|
||||
<a-col :span="12">
|
||||
<a-form-item label="姓名" v-bind="validateInfos.guardianName" id="ElderInfoForm-guardianName"
|
||||
name="guardianName">
|
||||
<a-input v-model:value="formData.guardianName" placeholder="请输入监护人姓名" ></a-input>
|
||||
<a-input v-model:value="formData.guardianName" allow-clear></a-input>
|
||||
<!-- <span>{{ formData.guardianName }}</span> -->
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<!-- <a-col :span="12">
|
||||
<a-form-item label="关系" v-bind="validateInfos.relationship" id="ElderInfoForm-relationship"
|
||||
name="relationship">
|
||||
<a-input v-model:value="formData.relationship" allow-clear></a-input>
|
||||
<span>{{ formData.relationship }}</span>
|
||||
</a-form-item>
|
||||
</a-col> -->
|
||||
<a-col :span="12">
|
||||
<a-form-item label="身份证号" v-bind="validateInfos.guardianIdCard" id="ElderInfoForm-guardianIdCard"
|
||||
name="guardianIdCard">
|
||||
<a-input v-model:value="formData.guardianIdCard" placeholder="请输入监护人身份证号" ></a-input>
|
||||
<a-input v-model:value="formData.guardianIdCard" allow-clear></a-input>
|
||||
<!-- <span>{{ formData.guardianIdCard }}</span> -->
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="12">
|
||||
<a-form-item label="联系电话" v-bind="validateInfos.guardianPhone" id="ElderInfoForm-guardianPhone"
|
||||
name="guardianPhone">
|
||||
<a-input v-model:value="formData.guardianPhone" placeholder="请输入联系电话" ></a-input>
|
||||
<a-input v-model:value="formData.guardianPhone" allow-clear></a-input>
|
||||
<!-- <span>{{ formData.guardianPhone }}</span> -->
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="12">
|
||||
<a-form-item label="家庭住址" v-bind="validateInfos.guardianHomeAddress"
|
||||
id="ElderInfoForm-guardianHomeAddress" name="guardianHomeAddress">
|
||||
<a-input v-model:value="formData.guardianHomeAddress" placeholder="请输入监护人家庭住址" ></a-input>
|
||||
<a-textarea v-model:value="formData.guardianHomeAddress" :autosize="{ minRows: 1 }" />
|
||||
<!-- <span>{{ formData.guardianHomeAddress }}</span> -->
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="12">
|
||||
<a-form-item label="工作单位" v-bind="validateInfos.guardianWorkUnit" id="ElderInfoForm-guardianWorkUnit"
|
||||
name="guardianWorkUnit">
|
||||
<a-input v-model:value="formData.guardianWorkUnit" placeholder="请输入监护人工作单位" ></a-input>
|
||||
<a-textarea v-model:value="formData.guardianWorkUnit" :autosize="{ minRows: 1 }" />
|
||||
<!-- <span>{{ formData.guardianWorkUnit }}</span> -->
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
|
|
@ -137,24 +137,23 @@
|
|||
<a-col :span="12">
|
||||
<a-form-item label="有效开始日期" v-bind="validateInfos.startTime" id="ElderInfoForm-startTime"
|
||||
name="startTime">
|
||||
<a-input v-model:value="formData.guardianWorkUnit" placeholder="有效开始日期" ></a-input>
|
||||
<!-- <a-date-picker placeholder="请选择有效开始日期" v-model:value="formData.startTime" showTime
|
||||
value-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" /> -->
|
||||
<a-date-picker v-model:value="formData.startTime" value-format="YYYY-MM-DD" style="width: 100%"
|
||||
allow-clear />
|
||||
<!-- <span>{{ formData.startTime }}</span> -->
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="12">
|
||||
<a-form-item label="有效结束日期" v-bind="validateInfos.endTime" id="ElderInfoForm-endTime" name="endTime">
|
||||
<a-input :value="formData.endTime == '9999-12-31' ? '长期' : formData.endTime" placeholder="有效结束日期" ></a-input>
|
||||
<!-- <a-date-picker placeholder="请选择有效结束日期" v-model:value="formData.endTime" showTime
|
||||
value-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" /> -->
|
||||
<a-input v-if="formData.endTime == '9999-12-31'" :value="'长期'" allow-clear></a-input>
|
||||
<a-date-picker v-else v-model:value="formData.endTime" value-format="YYYY-MM-DD" style="width: 100%"
|
||||
allow-clear />
|
||||
<!-- {{ formData.endTime == '9999-12-31' ? '长期' : formData.endTime }} -->
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="12">
|
||||
<a-form-item label="签发机关" v-bind="validateInfos.issuingAuthority" id="ElderInfoForm-issuingAuthority"
|
||||
name="issuingAuthority">
|
||||
<a-input v-model:value="formData.issuingAuthority" placeholder="请输入签发机关" ></a-input>
|
||||
<a-input v-model:value="formData.issuingAuthority" allow-clear></a-input>
|
||||
<!-- <span>{{ formData.issuingAuthority }}</span> -->
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
|
|
|
|||
|
|
@ -132,7 +132,7 @@ const filteredTableData = computed(() => {
|
|||
&& item.d1 !== 'currentState'
|
||||
&& item.d1 !== 'guardianOpenId'
|
||||
// && item.d1 !== 'guardianName'
|
||||
// && item.d1 !== 'relationship'
|
||||
&& item.d1 !== 'relationship'
|
||||
// && item.d1 !== 'guardianIdCard'
|
||||
// && item.d1 !== 'guardianPhone'
|
||||
&& item.d1 !== 'guardianDateOfBirth'
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
<template>
|
||||
<a-spin :spinning="confirmLoading">
|
||||
<JFormContainer :disabled="disabled">
|
||||
<JFormContainer :disabled="true">
|
||||
<template #detail>
|
||||
<a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol" name="ElderTagForm">
|
||||
<a-row>
|
||||
<a-row class="card-class">
|
||||
<a-col :span="24">
|
||||
<a-form-item label="标签类型" v-bind="validateInfos.type" id="ElderTagForm-type" name="type">
|
||||
<j-dict-select-tag v-model:value="formData.type" dictCode="elder_tag_type" placeholder="请选择标签类型"
|
||||
|
|
@ -262,6 +262,19 @@ defineExpose({
|
|||
|
||||
<style lang="less" scoped>
|
||||
.antd-modal-form {
|
||||
padding: 14px;
|
||||
// padding: 14px;
|
||||
}
|
||||
|
||||
.card-class {
|
||||
padding-top: 24px;
|
||||
padding-bottom: 24px;
|
||||
padding-left: 14px;
|
||||
padding-right: 14px;
|
||||
// background-color: rgba(255, 255, 255, 0.9);
|
||||
background-color: #fcfdff;
|
||||
border-radius: 10px;
|
||||
// box-shadow: rgba(0, 0, 0, 0.1) 0px 2px 12px;
|
||||
margin-bottom: 14px;
|
||||
|
||||
}
|
||||
</style>
|
||||
|
|
|
|||
|
|
@ -0,0 +1,280 @@
|
|||
<template>
|
||||
<a-spin :spinning="confirmLoading">
|
||||
<JFormContainer :disabled="disabled">
|
||||
<template #detail>
|
||||
<a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol" name="ElderTagForm">
|
||||
<a-row>
|
||||
<a-col :span="24">
|
||||
<a-form-item label="标签类型" v-bind="validateInfos.type" id="ElderTagForm-type" name="type">
|
||||
<j-dict-select-tag v-model:value="formData.type" dictCode="elder_tag_type" placeholder="请选择标签类型"
|
||||
allowClear :disabled="!!formData.id" @change="handleTypeChanged" />
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="24">
|
||||
<a-form-item label="标签名称" v-bind="validateInfos.tagName" id="ElderTagForm-tagName" name="tagName">
|
||||
<a-input v-model:value="formData.tagName" placeholder="请输入标签名称" allow-clear :disabled="!!formData.id"
|
||||
:maxlength="10" :showCount="true"></a-input>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="24">
|
||||
<a-form-item label="说明" v-bind="validateInfos.describ" id="ElderTagForm-tagName" name="tagName">
|
||||
<a-textarea v-model:value="formData.describ" placeholder="请输入说明" :maxlength="200" :rows="3"
|
||||
:autosize="{ minRows: 3 }" :showCount="true" :disabled="!!formData.id" />
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="24">
|
||||
<a-form-item label="价格(元)" v-bind="validateInfos.price" id="ElderTagForm-price" name="price">
|
||||
<a-input-number v-model:value="formData.price" placeholder="请输入价格" style="width: 100%" :min="0"
|
||||
:max="99.99" :precision="2" @keydown="onPriceKeydown" />
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="24">
|
||||
<a-form-item label="图标" v-bind="validateInfos.pic" id="ElderTagForm-pic" name="pic">
|
||||
<!-- <JImageUploadToOpe v-if="opeType == 'dmlook'" :fileMax="1" v-model:value="dmlookVal">
|
||||
</JImageUploadToOpe> -->
|
||||
<JImageUploadToOpe :toOpe="true" :bizPath="'eldertag'" :fileMax="1" v-model:value="formData.pic"
|
||||
:disabled="!!formData.id || !isMain">
|
||||
</JImageUploadToOpe>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="24">
|
||||
<a-form-item label="焦点图标" v-bind="validateInfos.picFocus" id="ElderTagForm-picFocus" name="picFocus">
|
||||
<!-- <JImageUploadToOpe v-if="opeType == 'dmlook'" :fileMax="1" v-model:value="dmlookVal">
|
||||
</JImageUploadToOpe> -->
|
||||
<JImageUploadToOpe :toOpe="true" :bizPath="'eldertag'" :fileMax="1" v-model:value="formData.picFocus"
|
||||
:disabled="!!formData.id || !isMain">
|
||||
</JImageUploadToOpe>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<!-- <a-col :span="24">
|
||||
<a-form-item label="排序" v-bind="validateInfos.sort" id="ElderTagForm-sort" name="sort">
|
||||
<a-input-number v-model:value="formData.sort" placeholder="请输入排序" style="width: 100%" />
|
||||
</a-form-item>
|
||||
</a-col> -->
|
||||
<a-col :span="24">
|
||||
<a-form-item label="是否启用" v-bind="validateInfos.izEnabled" id="ElderTagForm-izEnabled" name="izEnabled">
|
||||
<j-dict-select-tag type='radio' v-model:value="formData.izEnabled" dictCode="iz_enabled"
|
||||
placeholder="请选择是否启用" allowClear />
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
</a-row>
|
||||
</a-form>
|
||||
</template>
|
||||
</JFormContainer>
|
||||
</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 { getValueType } from '/@/utils';
|
||||
import { saveOrUpdate } from '../ElderTag.api';
|
||||
import { Form } from 'ant-design-vue';
|
||||
import JFormContainer from '/@/components/Form/src/container/JFormContainer.vue';
|
||||
import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
|
||||
import JImageUpload from '/@/components/Form/src/jeecg/components/JImageUpload.vue';
|
||||
import JImageUploadToOpe from '/@/components/Form/src/jeecg/components/JImageUploadToOpe.vue';
|
||||
|
||||
const opeMediaAddress = import.meta.env.VITE_OPE_MEDIA_ADDRESS
|
||||
const props = defineProps({
|
||||
formDisabled: { type: Boolean, default: false },
|
||||
formData: { type: Object, default: () => ({}) },
|
||||
formBpm: { type: Boolean, default: true },
|
||||
mediaApiAddress: '',//指令资源请求地址
|
||||
opeType: 'look',
|
||||
isMain: false,//是否主指令库
|
||||
});
|
||||
const dmlookVal = ref('')
|
||||
const defaultBodyPic = import.meta.env.VITE_DEFAULT_ELDER_TAG_BODY_PIC
|
||||
const defaultEmoPic = import.meta.env.VITE_DEFAULT_ELDER_TAG_EMO_PIC
|
||||
const onPriceKeydown = (e: KeyboardEvent) => {
|
||||
const key = e.key;
|
||||
// 放行控制键
|
||||
if (['Backspace', 'Delete', 'ArrowLeft', 'ArrowRight', 'Tab'].includes(key)) return;
|
||||
// 只能输数字和点
|
||||
if (!/[\d.]/.test(key)) {
|
||||
e.preventDefault();
|
||||
return;
|
||||
}
|
||||
const input = e.target as HTMLInputElement;
|
||||
const { value, selectionStart: s, selectionEnd: t } = input;
|
||||
const next = value.slice(0, s!) + key + value.slice(t!);
|
||||
// 整数最多2位，小数最多2位
|
||||
if (!/^\d{0,2}(?:\.\d{0,2})?$/.test(next)) {
|
||||
e.preventDefault();
|
||||
}
|
||||
};
|
||||
const formRef = ref();
|
||||
const useForm = Form.useForm;
|
||||
const emit = defineEmits(['register', 'ok']);
|
||||
const formData = reactive<Record<string, any>>({
|
||||
id: '',
|
||||
type: 'tx',
|
||||
tagName: '',
|
||||
price: 0,
|
||||
pic: defaultBodyPic,
|
||||
picFocus: defaultBodyPic,
|
||||
sort: 99,
|
||||
izEnabled: '0',
|
||||
describ: '',
|
||||
});
|
||||
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({
|
||||
type: [{ required: true, message: '请输入标签类型!' },],
|
||||
tagName: [{ required: true, message: '请输入标签名称!' },],
|
||||
price: [{ required: true, message: '请输入价格!' }, { pattern: /^(([0-9][0-9]*)|([0]\.\d{0,2}|[1-9][0-9]*\.\d{0,2}))$/, message: '请输入正确的金额!' },],
|
||||
izEnabled: [{ required: true, message: '请输入是否启用!' },],
|
||||
});
|
||||
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);
|
||||
// if (props.opeType == 'dmlook') {
|
||||
// if (!!formData.pic) {
|
||||
// dmlookVal.value = props.mediaApiAddress + formData.pic
|
||||
// } else {
|
||||
// if (formData.type == 'qx') {
|
||||
// dmlookVal.value = defaultEmoPic
|
||||
// } else {
|
||||
// dmlookVal.value = defaultBodyPic
|
||||
// }
|
||||
// }
|
||||
// } else {
|
||||
if (!formData.pic) {
|
||||
if (formData.type == 'qx') {
|
||||
formData.pic = defaultEmoPic
|
||||
formData.picFocus = defaultEmoPic
|
||||
} else {
|
||||
formData.pic = defaultBodyPic
|
||||
formData.picFocus = defaultBodyPic
|
||||
}
|
||||
}
|
||||
// }
|
||||
})
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* 提交数据
|
||||
*/
|
||||
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(',');
|
||||
}
|
||||
}
|
||||
}
|
||||
if (model.pic == defaultBodyPic || model.pic == defaultEmoPic) {
|
||||
model.pic = null
|
||||
}
|
||||
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;
|
||||
});
|
||||
}
|
||||
|
||||
function handleTypeChanged(v_) {
|
||||
if (!formData.pic || formData.pic == defaultEmoPic || formData.pic == defaultBodyPic) {
|
||||
if (v_ == 'qx') {
|
||||
formData.pic = defaultEmoPic
|
||||
formData.picFocus = defaultEmoPic
|
||||
} else {
|
||||
formData.pic = defaultBodyPic
|
||||
formData.picFocus = defaultBodyPic
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
defineExpose({
|
||||
add,
|
||||
edit,
|
||||
submitForm,
|
||||
});
|
||||
</script>
|
||||
|
||||
<style lang="less" scoped>
|
||||
.antd-modal-form {
|
||||
// padding: 14px;
|
||||
}
|
||||
|
||||
.card-class {
|
||||
padding-top: 24px;
|
||||
padding-bottom: 24px;
|
||||
padding-left: 14px;
|
||||
padding-right: 14px;
|
||||
// background-color: rgba(255, 255, 255, 0.9);
|
||||
background-color: #fcfdff;
|
||||
border-radius: 10px;
|
||||
// box-shadow: rgba(0, 0, 0, 0.1) 0px 2px 12px;
|
||||
margin-bottom: 14px;
|
||||
|
||||
}
|
||||
</style>
|
||||
|
|
@ -1,12 +1,14 @@
|
|||
<template>
|
||||
<a-drawer :title="title" width="50vw" v-model:visible="visible" :closable="true"
|
||||
:footer-style="{ textAlign: 'right' }" @cancel="handleCancel">
|
||||
:footer-style="{ textAlign: 'right' }" :bodyStyle="{ padding: '14px' }" @cancel="handleCancel">
|
||||
<template #footer>
|
||||
<a-button @click="handleCancel" style="margin-right: 8px;">关闭</a-button>
|
||||
<a-button @click="handleOk" v-show="!disableSubmit">确认</a-button>
|
||||
</template>
|
||||
<ElderTagForm ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"
|
||||
<ElderTagForm v-if="disableSubmit" ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"
|
||||
:mediaApiAddress="mediaApiAddress" :opeType="opeType" :isMain="isMain"></ElderTagForm>
|
||||
<ElderTagFormEdit v-else ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"
|
||||
:mediaApiAddress="mediaApiAddress" :opeType="opeType" :isMain="isMain"></ElderTagFormEdit>
|
||||
</a-drawer>
|
||||
<a-drawer :title="'标准标签库'" width="80vw" v-model:visible="etmVisible" :closable="true"
|
||||
:footer-style="{ textAlign: 'right' }" @close="handleCancelETM" :maskClosable="true">
|
||||
|
|
@ -23,6 +25,7 @@
|
|||
<script lang="ts" setup>
|
||||
import { ref, nextTick, defineExpose } from 'vue';
|
||||
import ElderTagForm from './ElderTagForm.vue'
|
||||
import ElderTagFormEdit from './ElderTagFormEdit.vue'
|
||||
import JModal from '/@/components/Modal/src/JModal/JModal.vue';
|
||||
import { clearCache } from '/@/utils/cache/cacheUtil'
|
||||
import { useMessage } from '/@/hooks/web/useMessage';
|
||||
|
|
|
|||
|
|
@ -0,0 +1,169 @@
|
|||
<template>
|
||||
<a-spin :spinning="confirmLoading">
|
||||
<JFormContainer :disabled="disabled">
|
||||
<template #detail>
|
||||
<a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol" name="BlWarehouseMaterialInfoForm">
|
||||
<a-row>
|
||||
<a-col :span="24">
|
||||
<a-form-item label="库房" v-bind="validateInfos.nuName" id="BlWarehouseMaterialInfoForm-nuName" name="nuName" >
|
||||
<a-input v-model:value="formData.nuName" ></a-input>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="24">
|
||||
<a-form-item label="负责人" v-bind="validateInfos.fzr" id="BlWarehouseMaterialInfoForm-fzr" name="fzr" >
|
||||
<a-input v-model:value="formData.fzr" ></a-input>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="24">
|
||||
<a-form-item label="负责人电话" v-bind="validateInfos.fzrTel" id="BlWarehouseMaterialInfoForm-fzrTel" name="fzrTel" >
|
||||
<a-input v-model:value="formData.fzrTel" ></a-input>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="24">
|
||||
<a-form-item label="负责人头像" v-bind="validateInfos.fzrHeadPath" id="BlWarehouseMaterialInfoForm-fzrHeadPath" name="fzrHeadPath">
|
||||
<j-image-upload :fileMax="1" text="无" v-model:value="formData.fzrHeadPath"></j-image-upload>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
</a-row>
|
||||
</a-form>
|
||||
</template>
|
||||
</JFormContainer>
|
||||
</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 JSelectMultiple from '/@/components/Form/src/jeecg/components/JSelectMultiple.vue';
|
||||
import { getValueType } from '/@/utils';
|
||||
import { editFzr } from '../BlWarehouseMaterialInfo.api';
|
||||
import { Form } from 'ant-design-vue';
|
||||
import JFormContainer from '/@/components/Form/src/container/JFormContainer.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: '',
|
||||
nuId: '',
|
||||
nuName: '',
|
||||
fzr: '',
|
||||
fzrTel: '',
|
||||
fzrHeadPath:'',
|
||||
});
|
||||
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({
|
||||
nuName: [{ required: true, message: '请输入库房名称!' },],
|
||||
fzrTel: [{ required: false, message: '请输入负责人电话!' },{ pattern: /^1[3456789]\d{9}$/, message: '手机号码格式有误', trigger: 'blur' }],
|
||||
});
|
||||
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 editFzr(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>
|
||||
|
|
@ -1,77 +1,91 @@
|
|||
<template>
|
||||
<j-modal :title="title" :width="width" :visible="visible" @ok="handleOk" :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }" @cancel="handleCancel" cancelText="关闭">
|
||||
<!-- <j-modal :title="title" :width="width" :visible="visible" @ok="handleOk" :okButtonProps="{ class: { 'jee-hidden': disableSubmit } }" @cancel="handleCancel" cancelText="关闭">
|
||||
<CkfzrForm ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false"></CkfzrForm>
|
||||
</j-modal>
|
||||
</j-modal> -->
|
||||
|
||||
<a-drawer :title="title" width="50vw" v-model:visible="visible" :closable="true"
|
||||
:footer-style="{ textAlign: 'right' }" :bodyStyle="{ padding: '14px' }" @cancel="handleCancel">
|
||||
<template #footer>
|
||||
<a-button @click="handleCancel" style="margin-right: 8px;">关闭</a-button>
|
||||
<a-button @click="handleOk" v-show="!disableSubmit">确认</a-button>
|
||||
</template>
|
||||
<CkfzrForm v-if="disableSubmit" ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit"
|
||||
:formBpm="false">
|
||||
</CkfzrForm>
|
||||
<CkfzrFormEdit v-else ref="registerForm" @ok="submitCallback" :formDisabled="disableSubmit" :formBpm="false">
|
||||
</CkfzrFormEdit>
|
||||
</a-drawer>
|
||||
</template>
|
||||
|
||||
<script lang="ts" setup>
|
||||
import { ref, nextTick, defineExpose } from 'vue';
|
||||
import CkfzrForm from './CkfzrForm.vue'
|
||||
import JModal from '/@/components/Modal/src/JModal/JModal.vue';
|
||||
|
||||
const title = ref<string>('');
|
||||
const width = ref<number>(800);
|
||||
const visible = ref<boolean>(false);
|
||||
const disableSubmit = ref<boolean>(false);
|
||||
const registerForm = ref();
|
||||
const emit = defineEmits(['register', 'success']);
|
||||
import { ref, nextTick, defineExpose } from 'vue';
|
||||
import CkfzrForm from './CkfzrForm.vue'
|
||||
import CkfzrFormEdit from './CkfzrFormEdit.vue'
|
||||
import JModal from '/@/components/Modal/src/JModal/JModal.vue';
|
||||
|
||||
/**
|
||||
* 新增
|
||||
*/
|
||||
function add() {
|
||||
title.value = '新增';
|
||||
visible.value = true;
|
||||
nextTick(() => {
|
||||
registerForm.value.add();
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* 编辑
|
||||
* @param record
|
||||
*/
|
||||
function edit(record) {
|
||||
title.value = disableSubmit.value ? '详情' : '编辑';
|
||||
visible.value = true;
|
||||
nextTick(() => {
|
||||
registerForm.value.edit(record);
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* 确定按钮点击事件
|
||||
*/
|
||||
function handleOk() {
|
||||
registerForm.value.submitForm();
|
||||
}
|
||||
const title = ref<string>('');
|
||||
const width = ref<number>(800);
|
||||
const visible = ref<boolean>(false);
|
||||
const disableSubmit = ref<boolean>(false);
|
||||
const registerForm = ref();
|
||||
const emit = defineEmits(['register', 'success']);
|
||||
|
||||
/**
|
||||
* form保存回调事件
|
||||
*/
|
||||
function submitCallback() {
|
||||
handleCancel();
|
||||
emit('success');
|
||||
}
|
||||
|
||||
/**
|
||||
* 取消按钮回调事件
|
||||
*/
|
||||
function handleCancel() {
|
||||
visible.value = false;
|
||||
}
|
||||
|
||||
defineExpose({
|
||||
add,
|
||||
edit,
|
||||
disableSubmit,
|
||||
/**
|
||||
* 新增
|
||||
*/
|
||||
function add() {
|
||||
title.value = '新增';
|
||||
visible.value = true;
|
||||
nextTick(() => {
|
||||
registerForm.value.add();
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* 编辑
|
||||
* @param record
|
||||
*/
|
||||
function edit(record) {
|
||||
title.value = disableSubmit.value ? '详情' : '编辑';
|
||||
visible.value = true;
|
||||
nextTick(() => {
|
||||
registerForm.value.edit(record);
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* 确定按钮点击事件
|
||||
*/
|
||||
function handleOk() {
|
||||
registerForm.value.submitForm();
|
||||
}
|
||||
|
||||
/**
|
||||
* form保存回调事件
|
||||
*/
|
||||
function submitCallback() {
|
||||
handleCancel();
|
||||
emit('success');
|
||||
}
|
||||
|
||||
/**
|
||||
* 取消按钮回调事件
|
||||
*/
|
||||
function handleCancel() {
|
||||
visible.value = false;
|
||||
}
|
||||
|
||||
defineExpose({
|
||||
add,
|
||||
edit,
|
||||
disableSubmit,
|
||||
});
|
||||
</script>
|
||||
|
||||
<style lang="less">
|
||||
/**隐藏样式-modal确定按钮 */
|
||||
.jee-hidden {
|
||||
display: none !important;
|
||||
}
|
||||
/**隐藏样式-modal确定按钮 */
|
||||
.jee-hidden {
|
||||
display: none !important;
|
||||
}
|
||||
</style>
|
||||
<style lang="less" scoped></style>
|
||||
|
|
|
|||
Loading…
Reference in New Issue