diff --git a/src/views/admin/allMaterialInfo/NuBizAllMaterialInfo.data.ts b/src/views/admin/allMaterialInfo/NuBizAllMaterialInfo.data.ts index 945c1e2..a6530fd 100644 --- a/src/views/admin/allMaterialInfo/NuBizAllMaterialInfo.data.ts +++ b/src/views/admin/allMaterialInfo/NuBizAllMaterialInfo.data.ts @@ -6,7 +6,7 @@ import { getWeekMonthQuarterYear } from '/@/utils'; //列表数据 export const columns: BasicColumn[] = [ { - title: '货品名称', + title: '物料名称', align: "center", dataIndex: 'materialName' }, @@ -34,7 +34,7 @@ export const columns: BasicColumn[] = [ // 高级查询数据 export const superQuerySchema = { - materialName: {title: '货品名称',order: 0,view: 'text', type: 'string',}, + materialName: {title: '物料名称',order: 0,view: 'text', type: 'string',}, specificationModel: {title: '规格型号',order: 1,view: 'text', type: 'string',}, brandType: {title: '品牌型号',order: 2,view: 'text', type: 'string',}, salesUnitPrice: {title: '销售单价',order: 3,view: 'number', type: 'number',}, diff --git a/src/views/admin/allMaterialInfo/components/NuBizAllMaterialInfoForm.vue b/src/views/admin/allMaterialInfo/components/NuBizAllMaterialInfoForm.vue index 62baae7..c4d32fb 100644 --- a/src/views/admin/allMaterialInfo/components/NuBizAllMaterialInfoForm.vue +++ b/src/views/admin/allMaterialInfo/components/NuBizAllMaterialInfoForm.vue @@ -5,8 +5,8 @@ - - + + diff --git a/src/views/admin/bizSuppliers/NuBizSuppliersMaterialInfo.data.ts b/src/views/admin/bizSuppliers/NuBizSuppliersMaterialInfo.data.ts index c7e494d..96244c8 100644 --- a/src/views/admin/bizSuppliers/NuBizSuppliersMaterialInfo.data.ts +++ b/src/views/admin/bizSuppliers/NuBizSuppliersMaterialInfo.data.ts @@ -11,7 +11,7 @@ export const columns: BasicColumn[] = [ dataIndex: 'suppliersId_dictText' }, { - title: '货品名称', + title: '物料名称', align: "center", dataIndex: 'materialName' }, @@ -44,7 +44,7 @@ export const columns: BasicColumn[] = [ // 高级查询数据 export const superQuerySchema = { suppliersId: {title: '供应商',order: 0,view: 'list', type: 'string',dictTable: "nu_biz_suppliers_info", dictCode: 'id', dictText: 'suppliers_name',}, - materialName: {title: '货品名称',order: 1,view: 'text', type: 'string',}, + materialName: {title: '物料名称',order: 1,view: 'text', type: 'string',}, specificationModel: {title: '规格型号',order: 2,view: 'text', type: 'string',}, brandType: {title: '品牌型号',order: 3,view: 'text', type: 'string',}, salesUnitPrice: {title: '销售单价',order: 4,view: 'number', type: 'number',}, diff --git a/src/views/admin/bizSuppliers/NuBizSuppliersMaterialInfoList.vue b/src/views/admin/bizSuppliers/NuBizSuppliersMaterialInfoList.vue index 7d394ef..ed32a2b 100644 --- a/src/views/admin/bizSuppliers/NuBizSuppliersMaterialInfoList.vue +++ b/src/views/admin/bizSuppliers/NuBizSuppliersMaterialInfoList.vue @@ -12,8 +12,8 @@ --> - - + + diff --git a/src/views/admin/bizSuppliers/NuBizSuppliersMateriallInfoModal.vue b/src/views/admin/bizSuppliers/NuBizSuppliersMateriallInfoModal.vue index 281eda8..fdf49b6 100644 --- a/src/views/admin/bizSuppliers/NuBizSuppliersMateriallInfoModal.vue +++ b/src/views/admin/bizSuppliers/NuBizSuppliersMateriallInfoModal.vue @@ -30,7 +30,7 @@ const emit = defineEmits(['register', 'success']); * @param record */ function edit(record) { - title.value = "货品信息"; + title.value = "物料信息"; visible.value = true; nextTick(() => { registerForm.value.init(record); diff --git a/src/views/admin/bizSuppliers/components/NuBizSuppliersMaterialInfoForm.vue b/src/views/admin/bizSuppliers/components/NuBizSuppliersMaterialInfoForm.vue index d19116c..fb971b5 100644 --- a/src/views/admin/bizSuppliers/components/NuBizSuppliersMaterialInfoForm.vue +++ b/src/views/admin/bizSuppliers/components/NuBizSuppliersMaterialInfoForm.vue @@ -10,8 +10,8 @@ - - + + diff --git a/src/views/invoicing/ConfigMaterial/ConfigMaterialInfo.data.ts b/src/views/invoicing/ConfigMaterial/ConfigMaterialInfo.data.ts index ce692fd..f03ae90 100644 --- a/src/views/invoicing/ConfigMaterial/ConfigMaterialInfo.data.ts +++ b/src/views/invoicing/ConfigMaterial/ConfigMaterialInfo.data.ts @@ -6,12 +6,12 @@ import { getWeekMonthQuarterYear } from '/@/utils'; //列表数据 export const columns: BasicColumn[] = [ { - title: '货品名称', + title: '物料名称', align: "center", dataIndex: 'materialName' }, { - title: '货品编码', + title: '物料编码', align: "center", dataIndex: 'materialNo' }, @@ -31,7 +31,7 @@ export const columns: BasicColumn[] = [ dataIndex: 'referenceUnitPrice' }, { - title: '货品单位', + title: '物料单位', align: "center", dataIndex: 'materialUnits' }, @@ -79,12 +79,12 @@ export const superQuerySchema = { categoryId: {title: '物料类别',order: 0,view: 'radio', type: 'string',dictTable: "nu_config_material_category", dictCode: 'id', dictText: 'category_name',}, typeId: {title: '物料类型',order: 1,view: 'radio', type: 'string',dictTable: "nu_config_material_type", dictCode: 'id', dictText: 'type_name',}, medicationId: {title: '用药类型',order: 2,view: 'radio', type: 'string',dictTable: "nu_config_material_medication", dictCode: 'id', dictText: 'medication_name',}, - materialName: {title: '货品名称',order: 3,view: 'text', type: 'string',}, - materialNo: {title: '货品编码',order: 4,view: 'text', type: 'string',}, + materialName: {title: '物料名称',order: 3,view: 'text', type: 'string',}, + materialNo: {title: '物料编码',order: 4,view: 'text', type: 'string',}, specificationModel: {title: '规格型号',order: 5,view: 'text', type: 'string',}, salesUnitPrice: {title: '销售单价',order: 6,view: 'number', type: 'number',}, referenceUnitPrice: {title: '参考单价',order: 7,view: 'number', type: 'number',}, - materialUnits: {title: '货品单位',order: 8,view: 'text', type: 'string',}, + materialUnits: {title: '物料单位',order: 8,view: 'text', type: 'string',}, multiUnitSwitch: {title: '多单位开关',order: 9,view: 'switch', type: 'string',}, oneUnit: {title: '父级单位',order: 10,view: 'text', type: 'string',}, oneUnitProportion: {title: '父级单位兑换比例',order: 11,view: 'number', type: 'number',}, diff --git a/src/views/invoicing/ConfigMaterial/ConfigMaterialInfoList.vue b/src/views/invoicing/ConfigMaterial/ConfigMaterialInfoList.vue index fe3d041..bd2f0fe 100644 --- a/src/views/invoicing/ConfigMaterial/ConfigMaterialInfoList.vue +++ b/src/views/invoicing/ConfigMaterial/ConfigMaterialInfoList.vue @@ -24,14 +24,14 @@ --> - - + + - - + + diff --git a/src/views/invoicing/ConfigMaterial/components/ConfigMaterialInfoForm.vue b/src/views/invoicing/ConfigMaterial/components/ConfigMaterialInfoForm.vue index f150309..58701f6 100644 --- a/src/views/invoicing/ConfigMaterial/components/ConfigMaterialInfoForm.vue +++ b/src/views/invoicing/ConfigMaterial/components/ConfigMaterialInfoForm.vue @@ -20,13 +20,13 @@ - - + + - - + + @@ -45,8 +45,8 @@ - - + + @@ -172,10 +172,10 @@ const validatorRules = reactive({ categoryId: [{ required: true, message: '请选择物料类别!'},], typeId: [{ required: true, message: '请选择物料类型!'},], - materialName: [{ required: true, message: '请输入货品名称!'},], + materialName: [{ required: true, message: '请输入物料名称!'},], salesUnitPrice: [{ required: true, message: '请输入销售单价!'},], referenceUnitPrice: [{ required: true, message: '请输入参考单价!'},], - materialUnits: [{ required: true, message: '请输入货品单位!'},], + materialUnits: [{ required: true, message: '请输入物料单位!'},], suppliers: [{ required: true, message: '请选择供应商!'},], }); const { resetFields, validate, validateInfos } = useForm(formData, validatorRules, { immediate: false });