Merge branch 'master' of http://47.115.223.229:8888/yangjun/nursing_unit_vue
This commit is contained in:
commit
777e838d04
|
@ -2,7 +2,7 @@
|
|||
VITE_USE_MOCK = false
|
||||
|
||||
# 发布路径
|
||||
VITE_PUBLIC_PATH = /biz103
|
||||
VITE_PUBLIC_PATH = /biz101
|
||||
|
||||
# 是否启用gzip或brotli压缩
|
||||
# 选项值: gzip | brotli | none
|
||||
|
@ -13,10 +13,10 @@ VITE_BUILD_COMPRESS = 'gzip'
|
|||
VITE_BUILD_COMPRESS_DELETE_ORIGIN_FILE = false
|
||||
|
||||
#后台接口父地址(必填)
|
||||
VITE_GLOB_API_URL=/nursingunit103
|
||||
VITE_GLOB_API_URL=/nursingunit101
|
||||
|
||||
#后台接口全路径地址(必填)
|
||||
VITE_GLOB_DOMAIN_URL=https://www.focusnu.com/nursingunit103
|
||||
VITE_GLOB_DOMAIN_URL=https://www.focusnu.com/nursingunit101
|
||||
|
||||
# 接口父路径前缀
|
||||
VITE_GLOB_API_URL_PREFIX=
|
||||
|
|
|
@ -47,9 +47,9 @@
|
|||
display: flex;
|
||||
padding-left: 7px;
|
||||
font-size: 16px;
|
||||
font-weight: 500;
|
||||
font-weight: 600;
|
||||
line-height: 24px;
|
||||
color: @text-color-base;
|
||||
color: rgba(51, 51, 51, 0.88);;
|
||||
cursor: move;
|
||||
user-select: none;
|
||||
|
||||
|
|
|
@ -42,7 +42,6 @@
|
|||
:bodyStyle="{ padding: 0, display: 'flex', justifyContent: 'center', alignItems: 'center' }"
|
||||
:footer="null"
|
||||
@cancel="handleCancel"
|
||||
:style="{ maxWidth: '90vw' }"
|
||||
>
|
||||
<img
|
||||
ref="previewImgRef"
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
<template>
|
||||
<Header :class="getHeaderClass" style="background-image: url('../resource/img/bj.png') !important;background-repeat: no-repeat;background-size: 100% auto;">
|
||||
<Header :class="getHeaderClass" class="headClass">
|
||||
<!-- left start -->
|
||||
<div :class="`${prefixCls}-left`">
|
||||
<!-- logo -->
|
||||
|
@ -271,4 +271,9 @@ export default defineComponent({
|
|||
border-bottom: 0px;
|
||||
border-left: 0px;
|
||||
}
|
||||
.headClass{
|
||||
background-image: url('../resource/img/bj.png') !important;
|
||||
background-repeat: no-repeat;
|
||||
background-size: 100% auto;
|
||||
}
|
||||
</style>
|
||||
|
|
|
@ -85,24 +85,28 @@
|
|||
<a-menu-item v-if="data.levle == '1'">
|
||||
<a href="javascript:;" @click="handleAddbj(data)">添加本级</a>
|
||||
</a-menu-item>
|
||||
<a-menu-item v-if="(data.levle == '1' || data.levle == '2') && data.tjxj == 0">
|
||||
<a-menu-item v-if="(data.levle == '1' || data.levle == '2') && data.tjxj == 0 && data.parentIzEnabled == 0 && data.izEnabled == '0'">
|
||||
<a href="javascript:;" @click="handleAddxj(data)">添加下级</a>
|
||||
</a-menu-item>
|
||||
<a-menu-item v-if="data?.children?.length == 0">
|
||||
<a-menu-item v-if="data?.children?.length == 0 && data.parentIzEnabled == 0 && data.izEnabled == '0'">
|
||||
<a href="javascript:;" @click="handleAdd(data)">添加物料</a>
|
||||
</a-menu-item>
|
||||
<a-menu-item>
|
||||
<a-menu-item v-if="data.parentIzEnabled == 0 && data.izEnabled == '0'">
|
||||
<a href="javascript:;" @click="handleFenleiEdit(data)">重命名</a>
|
||||
</a-menu-item>
|
||||
<a-menu-item v-if="data.izEnabled == '1'">
|
||||
<a-menu-item v-if="(data.izEnabled == '1' && data.parentIzEnabled == 0) || (data.parentIzEnabled == 1 && data.levle == '1')">
|
||||
<a href="javascript:;" @click="handleQyty(data,'0')">启用</a>
|
||||
</a-menu-item>
|
||||
<a-menu-item v-if="data.izEnabled == '0'">
|
||||
<a href="javascript:;" @click="handleQyty(data,'1')">停用</a>
|
||||
</a-menu-item>
|
||||
<a-menu-item v-if="data.levle == '2' || data.levle == '3'">
|
||||
<a-menu-item v-if="(data.levle == '2' || data.levle == '3') && data.parentIzEnabled == 0 && data.izEnabled == '0'">
|
||||
<a href="javascript:;" @click="handleQianyi(data)">迁移</a>
|
||||
</a-menu-item>
|
||||
|
||||
<a-menu-item v-if="(data.levle == '2' || data.levle == '3') && data.parentIzEnabled == 1 && data.izEnabled == '1'">
|
||||
<span>暂无操作</span>
|
||||
</a-menu-item>
|
||||
</a-menu>
|
||||
</template>
|
||||
</a-dropdown>
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
<a-row>
|
||||
<a-col :span="24" style="margin-top: 100px;">
|
||||
<a-form-item label="一级分类" v-bind="validateInfos.categoryName" id="ConfigMaterialMedicationForm-categoryName" name="categoryId">
|
||||
<a-input v-model:value="formData.categoryName" placeholder="请输入一级分类" allow-clear ></a-input>
|
||||
<a-input v-model:value="formData.categoryName" placeholder="请输入一级分类" maxLength="10" allow-clear ></a-input>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
</a-row>
|
||||
|
|
|
@ -4,19 +4,19 @@
|
|||
<template #detail>
|
||||
<a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol" name="ConfigMaterialInfoForm">
|
||||
<a-row>
|
||||
<a-col :span="8" hidden>
|
||||
<a-col :span="8" >
|
||||
<a-form-item label="一级分类" v-bind="validateInfos.categoryId" id="ConfigMaterialInfoForm-categoryId" name="categoryId">
|
||||
<j-dict-select-tag type='list' v-model:value="formData.categoryId" dictCode="nu_config_material_category,category_name,id,iz_enabled = 0 and del_flag = 0" placeholder="请选择一级分类" allow-clear @change="formData.typeId = null , formData.medicationId = null" />
|
||||
<j-dict-select-tag type='list' v-model:value="formData.categoryId" dictCode="nu_config_material_category,category_name,id,iz_enabled = 0 and del_flag = 0" placeholder="请选择一级分类" allow-clear @change="formData.typeId = null , formData.medicationId = null" disabled/>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="8" hidden>
|
||||
<a-col :span="8" >
|
||||
<a-form-item label="二级分类" v-bind="validateInfos.typeId" id="ConfigMaterialInfoForm-typeId" name="typeId">
|
||||
<j-dict-select-tag type='list' v-model:value="formData.typeId" :dictCode="`nu_config_material_type,type_name,id,category_id = ${formData.categoryId || -1} and iz_enabled = 0 and del_flag = 0 `" placeholder="请选择二级分类" @change="formData.medicationId = null" allow-clear />
|
||||
<j-dict-select-tag type='list' v-model:value="formData.typeId" :dictCode="`nu_config_material_type,type_name,id,category_id = ${formData.categoryId || -1} and iz_enabled = 0 and del_flag = 0 `" placeholder="请选择二级分类" @change="formData.medicationId = null" disabled allow-clear />
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="8" hidden>
|
||||
<a-col :span="8" >
|
||||
<a-form-item label="三级分类" v-bind="validateInfos.medicationId" id="ConfigMaterialInfoForm-medicationId" name="medicationId">
|
||||
<j-dict-select-tag type='list' v-model:value="formData.medicationId" :dictCode="`nu_config_material_medication,medication_name,id,type_id = ${formData.typeId || -1} and iz_enabled = 0 and del_flag = 0`" placeholder="请选择三级分类" allow-clear />
|
||||
<j-dict-select-tag type='list' v-model:value="formData.medicationId" :dictCode="`nu_config_material_medication,medication_name,id,type_id = ${formData.typeId || -1} and iz_enabled = 0 and del_flag = 0`" placeholder="请选择三级分类" allow-clear disabled />
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="8">
|
||||
|
@ -55,7 +55,7 @@
|
|||
</a-form-item>
|
||||
</a-col>
|
||||
<a-col :span="8">
|
||||
<a-form-item label="多单位采购单位" v-bind="validateInfos.multiUnitType" id="ConfigMaterialInfoForm-multiUnitType" name="multiUnitType">
|
||||
<a-form-item label="采购单位" v-bind="validateInfos.multiUnitType" id="ConfigMaterialInfoForm-multiUnitType" name="multiUnitType">
|
||||
<j-dict-select-tag type='radio' v-model:value="formData.multiUnitType" dictCode="multiUnitType" placeholder="请选择多单位默认采购" allow-clear />
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
|
@ -174,11 +174,11 @@
|
|||
});
|
||||
const { createMessage } = useMessage();
|
||||
const labelCol = ref<any>({ xs: { span: 24 }, sm: { span: 9 } });
|
||||
const wrapperCol = ref<any>({ xs: { span: 24 }, sm: { span: 13 } });
|
||||
const wrapperCol = ref<any>({ xs: { span: 24 }, sm: { span: 15 } });
|
||||
const labelCol2 = ref<any>({ xs: { span: 24 }, sm: { span: 5 } });
|
||||
const wrapperCol2 = ref<any>({ xs: { span: 24 }, sm: { span: 16 } });
|
||||
const wrapperCol2 = ref<any>({ xs: { span: 24 }, sm: { span: 18 } });
|
||||
const labelCol3 = ref<any>({ xs: { span: 24 }, sm: { span: 3 } });
|
||||
const wrapperCol3 = ref<any>({ xs: { span: 24 }, sm: { span: 20 } });
|
||||
const wrapperCol3 = ref<any>({ xs: { span: 24 }, sm: { span: 21 } });
|
||||
const confirmLoading = ref<boolean>(false);
|
||||
//表单验证
|
||||
const validatorRules = reactive({
|
||||
|
|
|
@ -19,7 +19,7 @@
|
|||
import JModal from '/@/components/Modal/src/JModal/JModal.vue';
|
||||
|
||||
const title = ref<string>('');
|
||||
const width = ref<number>(1200);
|
||||
const width = ref<number>(1300);
|
||||
const visible = ref<boolean>(false);
|
||||
const disableSubmit = ref<boolean>(false);
|
||||
const registerForm = ref();
|
||||
|
|
|
@ -16,7 +16,7 @@
|
|||
</a-col>
|
||||
<a-col :span="24">
|
||||
<a-form-item label="三级分类" v-bind="validateInfos.medicationName" id="ConfigMaterialMedicationForm-medicationName" name="medicationName">
|
||||
<a-input v-model:value="formData.medicationName" placeholder="请输入三级分类" allow-clear ></a-input>
|
||||
<a-input v-model:value="formData.medicationName" placeholder="请输入三级分类" maxLength="10" allow-clear ></a-input>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
</a-row>
|
||||
|
|
|
@ -11,7 +11,7 @@
|
|||
</a-col>
|
||||
<a-col :span="24">
|
||||
<a-form-item label="二级分类" v-bind="validateInfos.typeName" id="ConfigMaterialTypeForm-typeName" name="typeName">
|
||||
<a-input v-model:value="formData.typeName" placeholder="请输入二级分类" allow-clear ></a-input>
|
||||
<a-input v-model:value="formData.typeName" placeholder="请输入二级分类" maxLength="10" allow-clear ></a-input>
|
||||
</a-form-item>
|
||||
</a-col>
|
||||
</a-row>
|
||||
|
|
|
@ -107,6 +107,7 @@ import { e } from 'unocss';
|
|||
//赋值
|
||||
Object.assign(formData, tmpData);
|
||||
formData.categoryId = record.categoryId;
|
||||
formData.typeId = record.typeId;
|
||||
if(record.levle == '1'){
|
||||
formData.qycj = '2';
|
||||
}else if(record.levle == '2'){
|
||||
|
@ -160,7 +161,7 @@ import { e } from 'unocss';
|
|||
}else if(model.qycj == '1'){//迁移到二级
|
||||
model.typeId = "";
|
||||
if(!model.categoryId){
|
||||
createMessage.success("请选择一级分类!");
|
||||
createMessage.error("请选择一级分类!");
|
||||
return;
|
||||
}
|
||||
}else{
|
||||
|
@ -169,14 +170,18 @@ import { e } from 'unocss';
|
|||
return;
|
||||
}
|
||||
if(!model.categoryId){
|
||||
createMessage.success("请选择一级分类!");
|
||||
createMessage.error("请选择一级分类!");
|
||||
return;
|
||||
}
|
||||
if(!model.typeId){
|
||||
createMessage.success("请选择二级分类!");
|
||||
createMessage.error("请选择二级分类!");
|
||||
return;
|
||||
}
|
||||
}
|
||||
if(model.id == model.typeId){
|
||||
createMessage.error("不能选择自己作为上级分类!");
|
||||
return;
|
||||
}
|
||||
defHttp.post({ url: '/invoicing/configMaterialMedication/editQianyi', params: model }).then((res) => {
|
||||
emit('ok');
|
||||
});
|
||||
|
|
|
@ -136,7 +136,12 @@ export const formSchema: FormSchema[] = [
|
|||
dynamicRules: ({model,schema}) => {
|
||||
return [
|
||||
{ required: true, message: '请输入联系电话!'},
|
||||
{ max: 11, message: '不能超过11个字符!' }
|
||||
{ max: 11, message: '不能超过11个字符!' } ,
|
||||
{
|
||||
pattern: /^[0-9]*$/, // 仅允许数字
|
||||
message: '只能输入数字!',
|
||||
trigger: 'blur' // 失焦时校验(避免输入时频繁触发)
|
||||
}
|
||||
];
|
||||
},
|
||||
},
|
||||
|
@ -170,7 +175,12 @@ export const formSchema: FormSchema[] = [
|
|||
component: 'Input',
|
||||
dynamicRules: ({model,schema}) => {
|
||||
return [
|
||||
{ max: 32, message: '不能超过32个字符!' }
|
||||
{ max: 32, message: '不能超过32个字符!' } ,
|
||||
{
|
||||
pattern: /^[0-9]*$/, // 仅允许数字
|
||||
message: '只能输入数字!',
|
||||
trigger: 'blur' // 失焦时校验(避免输入时频繁触发)
|
||||
}
|
||||
];
|
||||
},
|
||||
},
|
||||
|
|
Loading…
Reference in New Issue