Compare commits

..

2 Commits

Author SHA1 Message Date
yangjun 8c6c28ba10 Merge branch 'master' of http://47.115.223.229:8888/yangjun/nursing_unit_vue
# Conflicts:
#	src/views/invoicing/warehouseMaterialInfo/components/CkfzrForm.vue
2025-11-04 13:53:23 +08:00
yangjun 9345b935fb 添加字段 2025-11-04 13:51:48 +08:00
1 changed files with 161 additions and 162 deletions

View File

@ -1,33 +1,43 @@
<template> <template>
<a-spin :spinning="confirmLoading"> <a-spin :spinning="confirmLoading">
<JFormContainer :disabled="true"> <JFormContainer :disabled="disabled">
<template #detail> <template #detail>
<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="BlWarehouseMaterialInfoForm">
name="BlWarehouseMaterialInfoForm"> <a-row>
<a-row class="card-class"> <a-col :span="24">
<a-col :span="24"> <a-form-item label="库房" v-bind="validateInfos.nuName" id="BlWarehouseMaterialInfoForm-nuName" name="nuName" >
<a-form-item label="库房" v-bind="validateInfos.nuName" id="BlWarehouseMaterialInfoForm-nuName" <a-input v-model:value="formData.nuName" ></a-input>
name="nuName"> </a-form-item>
<a-input v-model:value="formData.nuName"></a-input> </a-col>
</a-form-item> <a-col :span="24">
</a-col> <a-form-item label="负责人" v-bind="validateInfos.fzr" id="BlWarehouseMaterialInfoForm-fzr" name="fzr" >
<a-col :span="24"> <a-input v-model:value="formData.fzr" ></a-input>
<a-form-item label="负责人" v-bind="validateInfos.fzr" id="BlWarehouseMaterialInfoForm-fzr" name="fzr"> </a-form-item>
<a-input v-model:value="formData.fzr"></a-input> </a-col>
</a-form-item> <a-col :span="24">
</a-col> <a-form-item label="负责人电话" v-bind="validateInfos.fzrTel" id="BlWarehouseMaterialInfoForm-fzrTel" name="fzrTel" >
<a-col :span="24"> <a-input v-model:value="formData.fzrTel" ></a-input>
<a-form-item label="负责人电话" v-bind="validateInfos.fzrTel" id="BlWarehouseMaterialInfoForm-fzrTel" </a-form-item>
name="fzrTel"> </a-col>
<a-input v-model:value="formData.fzrTel"></a-input> <a-col :span="24">
</a-form-item> <a-form-item label="性别" v-bind="validateInfos.fzrSex" id="BlWarehouseMaterialInfoForm-fzrSex" name="fzrSex">
</a-col> <a-select placeholder="性别" v-model:value="formData.fzrSex">
<a-col :span="24"> <a-select-option value="">请选择</a-select-option>
<a-form-item label="负责人头像" v-bind="validateInfos.fzrHeadPath" id="BlWarehouseMaterialInfoForm-fzrHeadPath" <a-select-option value="男"></a-select-option>
name="fzrHeadPath"> <a-select-option value="女"></a-select-option>
</a-select>
</a-form-item>
</a-col>
<a-col :span="24">
<a-form-item label="年龄" v-bind="validateInfos.fzrAge" id="BlWarehouseMaterialInfoForm-fzrAge" name="fzrAge">
<a-input-number placeholder="年龄" v-model:value="formData.fzrAge" min="18" max="99" style="width: 100%" ></a-input-number>
</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> <j-image-upload :fileMax="1" text="无" v-model:value="formData.fzrHeadPath"></j-image-upload>
</a-form-item> </a-form-item>
</a-col> </a-col>
</a-row> </a-row>
</a-form> </a-form>
</template> </template>
@ -36,151 +46,140 @@
</template> </template>
<script lang="ts" setup> <script lang="ts" setup>
import { ref, reactive, defineExpose, nextTick, defineProps, computed, onMounted } from 'vue'; import { ref, reactive, defineExpose, nextTick, defineProps, computed, onMounted } from 'vue';
import { defHttp } from '/@/utils/http/axios'; import { defHttp } from '/@/utils/http/axios';
import { useMessage } from '/@/hooks/web/useMessage'; import { useMessage } from '/@/hooks/web/useMessage';
import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue'; import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue';
import JSelectMultiple from '/@/components/Form/src/jeecg/components/JSelectMultiple.vue'; import JSelectMultiple from '/@/components/Form/src/jeecg/components/JSelectMultiple.vue';
import { getValueType } from '/@/utils'; import { getValueType } from '/@/utils';
import { editFzr } from '../BlWarehouseMaterialInfo.api'; import { editFzr } from '../BlWarehouseMaterialInfo.api';
import { Form } from 'ant-design-vue'; import { Form } from 'ant-design-vue';
import JFormContainer from '/@/components/Form/src/container/JFormContainer.vue'; import JFormContainer from '/@/components/Form/src/container/JFormContainer.vue';
import JImageUpload from '/@/components/Form/src/jeecg/components/JImageUpload.vue'; import JImageUpload from '/@/components/Form/src/jeecg/components/JImageUpload.vue';
import { truncate } from 'node:fs'; const props = defineProps({
const props = defineProps({ formDisabled: { type: Boolean, default: false },
formDisabled: { type: Boolean, default: false }, formData: { type: Object, default: () => ({})},
formData: { type: Object, default: () => ({}) }, formBpm: { type: Boolean, default: true }
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);
}); });
} const formRef = ref();
const useForm = Form.useForm;
const emit = defineEmits(['register', 'ok']);
const formData = reactive<Record<string, any>>({
id: '',
nuId: '',
nuName: '',
fzr: '',
fzrTel: '',
fzrHeadPath:'',
fzrSex:'',
fzrAge:'',
});
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){
async function submitForm() { if(props.formData.disabled === false){
try { return false;
// }else{
await validate(); return true;
} catch ({ errorFields }) {
if (errorFields) {
const firstField = errorFields[0];
if (firstField) {
formRef.value.scrollToField(firstField.name, { behavior: 'smooth', block: 'center' });
} }
} }
return Promise.reject(errorFields); return props.formDisabled;
});
/**
* 新增
*/
function add() {
edit({});
} }
confirmLoading.value = true;
const isUpdate = ref<boolean>(false); /**
// * 编辑
let model = formData; */
if (model.id) { function edit(record) {
isUpdate.value = true; nextTick(() => {
} resetFields();
// const tmpData = {};
for (let data in model) { Object.keys(formData).forEach((key) => {
// if(record.hasOwnProperty(key)){
if (model[data] instanceof Array) { tmpData[key] = record[key]
let valueType = getValueType(formRef.value.getProps, data); }
// })
if (valueType === 'string') { //
model[data] = model[data].join(','); Object.assign(formData, tmpData);
}
}
}
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;
}); });
} }
/**
* 提交数据
*/
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({ defineExpose({
add, add,
edit, edit,
submitForm, submitForm,
}); });
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
.antd-modal-form { .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> </style>