yangjun
/
hldy_vue
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改bug

This commit is contained in:
yangjun 2026-03-03 09:38:09 +08:00
parent 2178ca0fa4
commit 0013392d52
9 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/views/admin/allMaterialInfo/NuBizAllMaterialInfo.data.ts
View File

@ -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',},

4
src/views/admin/allMaterialInfo/components/NuBizAllMaterialInfoForm.vue
View File

@ -5,8 +5,8 @@
<a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol" name="NuBizAllMaterialInfoForm">
<a-row>
<a-col :span="24">
<a-form-item label="货品名称" v-bind="validateInfos.materialName" id="NuBizAllMaterialInfoForm-materialName" name="materialName">
<a-input v-model:value="formData.materialName" placeholder="请输入货品名称" allow-clear ></a-input>
<a-form-item label="物料名称" v-bind="validateInfos.materialName" id="NuBizAllMaterialInfoForm-materialName" name="materialName">
<a-input v-model:value="formData.materialName" placeholder="请输入物料名称" allow-clear ></a-input>
</a-form-item>
</a-col>
<a-col :span="24">

4
src/views/admin/bizSuppliers/NuBizSuppliersMaterialInfo.data.ts
View File

@ -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',},

4
src/views/admin/bizSuppliers/NuBizSuppliersMaterialInfoList.vue
View File

@ -12,8 +12,8 @@
</a-col> -->
<a-col :lg="8">
<a-form-item name="materialName">
<template #label><span title="货品名称">货品名称</span></template>
<JInput placeholder="请输入货品名称" v-model:value="queryParam.materialName" allow-clear ></JInput>
<template #label><span title="物料名称">物料名称</span></template>
<JInput placeholder="请输入物料名称" v-model:value="queryParam.materialName" allow-clear ></JInput>
</a-form-item>
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">

2
src/views/admin/bizSuppliers/NuBizSuppliersMateriallInfoModal.vue
View File

@ -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);

4
src/views/admin/bizSuppliers/components/NuBizSuppliersMaterialInfoForm.vue
View File

@ -10,8 +10,8 @@
</a-form-item>
</a-col>
<a-col :span="24">
<a-form-item label="货品名称" v-bind="validateInfos.materialName" id="NuBizSuppliersMaterialInfoForm-materialName" name="materialName">
<a-input v-model:value="formData.materialName" placeholder="请输入货品名称" allow-clear ></a-input>
<a-form-item label="物料名称" v-bind="validateInfos.materialName" id="NuBizSuppliersMaterialInfoForm-materialName" name="materialName">
<a-input v-model:value="formData.materialName" placeholder="请输入物料名称" allow-clear ></a-input>
</a-form-item>
</a-col>
<a-col :span="24">

12
src/views/invoicing/ConfigMaterial/ConfigMaterialInfo.data.ts
View File

@ -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',},

8
src/views/invoicing/ConfigMaterial/ConfigMaterialInfoList.vue
View File

@ -24,14 +24,14 @@
</a-col> -->
<a-col :lg="6">
<a-form-item name="materialName">
<template #label><span title="货品名称">货品名称</span></template>
<j-input placeholder="请输入货品名称" v-model:value="queryParam.materialName" allow-clear ></j-input>
<template #label><span title="物料名称">物料名称</span></template>
<j-input placeholder="请输入物料名称" v-model:value="queryParam.materialName" allow-clear ></j-input>
</a-form-item>
</a-col>
<a-col :lg="6">
<a-form-item name="materialNo">
<template #label><span title="货品编码">货品编码</span></template>
<j-input placeholder="请输入货品编码" v-model:value="queryParam.materialNo" allow-clear ></j-input>
<template #label><span title="物料编码">物料编码</span></template>
<j-input placeholder="请输入物料编码" v-model:value="queryParam.materialNo" allow-clear ></j-input>
</a-form-item>
</a-col>
<a-col :lg="6">

16
src/views/invoicing/ConfigMaterial/components/ConfigMaterialInfoForm.vue
View File

@ -20,13 +20,13 @@
</a-form-item>
</a-col>
<a-col :span="8">
<a-form-item label="货品名称" v-bind="validateInfos.materialName" id="ConfigMaterialInfoForm-materialName" name="materialName">
<a-input v-model:value="formData.materialName" placeholder="请输入货品名称" allow-clear ></a-input>
<a-form-item label="物料名称" v-bind="validateInfos.materialName" id="ConfigMaterialInfoForm-materialName" name="materialName">
<a-input v-model:value="formData.materialName" placeholder="请输入物料名称" allow-clear ></a-input>
</a-form-item>
</a-col>
<a-col :span="8">
<a-form-item label="货品编码" v-bind="validateInfos.materialNo" id="ConfigMaterialInfoForm-materialNo" name="materialNo">
<a-input v-model:value="formData.materialNo" placeholder="请输入货品编码" allow-clear ></a-input>
<a-form-item label="物料编码" v-bind="validateInfos.materialNo" id="ConfigMaterialInfoForm-materialNo" name="materialNo">
<a-input v-model:value="formData.materialNo" placeholder="请输入物料编码" allow-clear ></a-input>
</a-form-item>
</a-col>
<a-col :span="8">
@ -45,8 +45,8 @@
</a-form-item>
</a-col>
<a-col :span="8">
<a-form-item label="货品单位" v-bind="validateInfos.materialUnits" id="ConfigMaterialInfoForm-materialUnits" name="materialUnits">
<a-input v-model:value="formData.materialUnits" placeholder="请输入货品单位" allow-clear ></a-input>
<a-form-item label="物料单位" v-bind="validateInfos.materialUnits" id="ConfigMaterialInfoForm-materialUnits" name="materialUnits">
<a-input v-model:value="formData.materialUnits" placeholder="请输入物料单位" allow-clear ></a-input>
</a-form-item>
</a-col>
<a-col :span="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 });