diff --git a/src/views/admin/allMaterialInfo/NuBizAllMaterialInfo.data.ts b/src/views/admin/allMaterialInfo/NuBizAllMaterialInfo.data.ts index 6ce388e..6a7aae3 100644 --- a/src/views/admin/allMaterialInfo/NuBizAllMaterialInfo.data.ts +++ b/src/views/admin/allMaterialInfo/NuBizAllMaterialInfo.data.ts @@ -20,6 +20,11 @@ export const columns: BasicColumn[] = [ align: "center", dataIndex: 'materialName' }, + { + title: '物料编码', + align: "center", + dataIndex: 'materialNo' + }, { title: '规格型号', align: "center", @@ -31,16 +36,14 @@ export const columns: BasicColumn[] = [ dataIndex: 'brandType' }, { - title: '销售单价', + title: '生产厂家', align: "center", - dataIndex: 'salesUnitPrice', - defaultHidden: true + dataIndex: 'manufacturer' }, { - title: '销售单位', + title: '是否启用', align: "center", - dataIndex: 'salesUnit', - defaultHidden: true + dataIndex: 'izEnabled_dictText', }, ]; diff --git a/src/views/admin/orgInfo/components/OrgApplyHldyForm.vue b/src/views/admin/orgInfo/components/OrgApplyHldyForm.vue index 71564a8..fc9ff85 100644 --- a/src/views/admin/orgInfo/components/OrgApplyHldyForm.vue +++ b/src/views/admin/orgInfo/components/OrgApplyHldyForm.vue @@ -131,6 +131,7 @@ function add() { */ function edit(record) { console.log("🌊 ~ edit ~ record:", record) + dataSource.value = [] nextTick(() => { resetFields(); let tmpData = {}; diff --git a/src/views/admin/orgapplyinfo/OrgApplyInfo.data.ts b/src/views/admin/orgapplyinfo/OrgApplyInfo.data.ts index 88e2a03..9be6d0e 100644 --- a/src/views/admin/orgapplyinfo/OrgApplyInfo.data.ts +++ b/src/views/admin/orgapplyinfo/OrgApplyInfo.data.ts @@ -96,7 +96,7 @@ export const orgColumns: BasicColumn[] = [ width: 120, }, { - title: '加盟地址', + title: '机构地址', align: 'center', dataIndex: 'comRegisterAddress', },