From 9c9a81f1688df3daa055a445e619874f18622b83 Mon Sep 17 00:00:00 2001 From: liufumingren Date: Thu, 5 Nov 2026 02:15:25 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=95=86=E5=93=81=E5=B1=9E=E6=80=A7?= =?UTF-8?q?=EF=BC=88=E5=88=86=E7=B1=BB/=E5=93=81=E7=89=8C/=E5=8D=95?= =?UTF-8?q?=E4=BD=8D=EF=BC=89=E5=85=B3=E8=81=94=E8=B4=A7=E4=B8=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - product_categories / product_brands / product_units 新增 subsidiary_id(NULL 表示主体级、全集团共用) - 列表与下拉按货主范围过滤:货主权限仅可见「主体级 + 自己所属公司」,并支持按货主筛选 - 新增/编辑支持选择货主,货主权限只能选主体或自己所属公司;同货主范围内名称唯一 - 详情/更新/删除对越权属性返回 403;导出新增货主列并收窄到可见范围 Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- backend/app/contract/index.js | 15 ++- backend/app/controller/productBrand.js | 122 ++++++++++++++---- backend/app/controller/productCategory.js | 122 ++++++++++++++---- backend/app/controller/productUnit.js | 122 ++++++++++++++---- backend/app/lib/productAttributeScope.js | 77 +++++++++++ backend/app/model/productBrand.js | 2 + backend/app/model/productCategory.js | 2 + backend/app/model/productUnit.js | 2 + backend/app/service/exportTask.js | 3 +- backend/app/utils/exportDefs.js | 28 +++- ...00-add-subsidiary-to-product-attributes.js | 33 +++++ frontend/src/api/productBrand.ts | 10 ++ frontend/src/api/productCategory.ts | 10 ++ frontend/src/api/productUnit.ts | 10 ++ .../ProductAttributePanel.vue | 71 +++++++++- 15 files changed, 536 insertions(+), 93 deletions(-) create mode 100644 backend/app/lib/productAttributeScope.js create mode 100644 backend/database/migrations/20261104071000-add-subsidiary-to-product-attributes.js diff --git a/backend/app/contract/index.js b/backend/app/contract/index.js index 7224337..acfb391 100644 --- a/backend/app/contract/index.js +++ b/backend/app/contract/index.js @@ -603,6 +603,9 @@ module.exports = { productAttributeItem: { id: { type: 'integer', description: '主键' }, principal_id: { type: 'integer', description: '所属主体ID' }, + subsidiary_id: { type: 'integer', description: '所属货主(下属公司ID);null 表示主体级(全集团共用)' }, + subsidiary_name: { type: 'string', description: '所属货主名称' }, + subsidiary: { type: 'principalSubsidiaryRef', description: '所属货主(下属公司)' }, name: { type: 'string', description: '名称(分类名/品牌名/单位名)' }, code: { type: 'string', description: '编码' }, status: { type: 'integer', description: '状态:1启用 0禁用' }, @@ -620,6 +623,7 @@ module.exports = { productUnitListResponse: buildListResponse('productUnitPage'), createProductCategoryRequest: { principal_id: { type: 'integer', description: '所属主体ID(系统按当前主体注入,可不传)' }, + subsidiary_id: { type: 'integer', description: '所属货主(下属公司ID);不传/传 null 表示主体级;所在公司权限只能选自己所属公司' }, name: { type: 'string', required: true, description: '分类名称,主体内唯一' }, code: { type: 'string', description: '分类编码' }, status: { type: 'integer', description: '状态:1启用 0禁用,默认1' }, @@ -627,7 +631,8 @@ module.exports = { remark: { type: 'string', description: '备注' }, }, updateProductCategoryRequest: { - name: { type: 'string', description: '分类名称,主体内唯一' }, + subsidiary_id: { type: 'integer', description: '所属货主(下属公司ID);不传表示主体级' }, + name: { type: 'string', description: '分类名称,同货主范围内唯一' }, code: { type: 'string', description: '分类编码' }, status: { type: 'integer', description: '状态:1启用 0禁用' }, sort: { type: 'integer', description: '排序' }, @@ -635,6 +640,7 @@ module.exports = { }, createProductBrandRequest: { principal_id: { type: 'integer', description: '所属主体ID(系统按当前主体注入,可不传)' }, + subsidiary_id: { type: 'integer', description: '所属货主(下属公司ID);不传/传 null 表示主体级;所在公司权限只能选自己所属公司' }, name: { type: 'string', required: true, description: '品牌名称,主体内唯一' }, code: { type: 'string', description: '品牌编码' }, status: { type: 'integer', description: '状态:1启用 0禁用,默认1' }, @@ -642,7 +648,8 @@ module.exports = { remark: { type: 'string', description: '备注' }, }, updateProductBrandRequest: { - name: { type: 'string', description: '品牌名称,主体内唯一' }, + subsidiary_id: { type: 'integer', description: '所属货主(下属公司ID);不传表示主体级' }, + name: { type: 'string', description: '品牌名称,同货主范围内唯一' }, code: { type: 'string', description: '品牌编码' }, status: { type: 'integer', description: '状态:1启用 0禁用' }, sort: { type: 'integer', description: '排序' }, @@ -650,6 +657,7 @@ module.exports = { }, createProductUnitRequest: { principal_id: { type: 'integer', description: '所属主体ID(系统按当前主体注入,可不传)' }, + subsidiary_id: { type: 'integer', description: '所属货主(下属公司ID);不传/传 null 表示主体级;所在公司权限只能选自己所属公司' }, name: { type: 'string', required: true, description: '单位名称,主体内唯一' }, code: { type: 'string', description: '单位编码' }, status: { type: 'integer', description: '状态:1启用 0禁用,默认1' }, @@ -657,7 +665,8 @@ module.exports = { remark: { type: 'string', description: '备注' }, }, updateProductUnitRequest: { - name: { type: 'string', description: '单位名称,主体内唯一' }, + subsidiary_id: { type: 'integer', description: '所属货主(下属公司ID);不传表示主体级' }, + name: { type: 'string', description: '单位名称,同货主范围内唯一' }, code: { type: 'string', description: '单位编码' }, status: { type: 'integer', description: '状态:1启用 0禁用' }, sort: { type: 'integer', description: '排序' }, diff --git a/backend/app/controller/productBrand.js b/backend/app/controller/productBrand.js index 0975978..6dfa408 100644 --- a/backend/app/controller/productBrand.js +++ b/backend/app/controller/productBrand.js @@ -3,6 +3,12 @@ const { Controller } = require('egg'); const { parsePagination, buildPageResult } = require('../lib/pagination'); const { attachUsedCount } = require('../lib/attributeUsage'); +const { + resolveScope, + visibilityWhere, + resolveSubsidiaryValue, + isVisible, +} = require('../lib/productAttributeScope'); /** 商品表引用品牌主键的字段名 */ const COLUMN = 'brand_id'; @@ -27,32 +33,44 @@ class ProductBrandController extends Controller { const { ctx } = this; const Op = this.app.Sequelize.Op; const { page, pageSize, offset, limit } = parsePagination(ctx.query); - const { keyword, status } = ctx.query; + const { keyword, status, subsidiary_id: subsidiaryId } = ctx.query; const principalId = ctx.state.principalId; - const where = { - [Op.or]: [ - { principal_id: principalId }, - { is_system: 1 }, - ], - }; + // 货主范围:集团权限看全部;所在公司权限仅看「主体级(无货主)+ 自己所属公司」 + const scope = await resolveScope(ctx); + const andConditions = [ + { [Op.or]: [{ principal_id: principalId }, { is_system: 1 }] }, + ]; + const visible = visibilityWhere(ctx, scope); + if (visible) andConditions.push(visible); if (keyword) { - where[Op.or] = [ - { name: { [Op.like]: `%${keyword}%` } }, - { code: { [Op.like]: `%${keyword}%` } }, - ]; + andConditions.push({ + [Op.or]: [ + { name: { [Op.like]: `%${keyword}%` } }, + { code: { [Op.like]: `%${keyword}%` } }, + ], + }); + } + if (status !== undefined && status !== '') andConditions.push({ status: Number(status) }); + // 货主筛选:0 表示主体级(无货主) + if (subsidiaryId !== undefined && subsidiaryId !== '') { + andConditions.push({ subsidiary_id: Number(subsidiaryId) === 0 ? null : Number(subsidiaryId) }); } - if (status !== undefined && status !== '') where.status = Number(status); const { count, rows } = await ctx.model.ProductBrand.findAndCountAll({ - where, + where: { [Op.and]: andConditions }, offset, limit, order: [[ 'sort', 'ASC' ], [ 'id', 'ASC' ]], + include: [ + { model: ctx.model.PrincipalSubsidiary, as: 'subsidiary', attributes: [ 'id', 'name' ], required: false }, + ], }); const list = await attachUsedCount(ctx, COLUMN, rows); - ctx.body = { code: 0, message: 'success', data: buildPageResult(list, count, { page, pageSize }) }; + // 附加扁平的货主名称(主体级为空串) + const data = list.map(row => ({ ...row, subsidiary_name: row.subsidiary ? row.subsidiary.name : '' })); + ctx.body = { code: 0, message: 'success', data: buildPageResult(data, count, { page, pageSize }) }; } /** @@ -66,15 +84,14 @@ class ProductBrandController extends Controller { const { ctx } = this; const Op = this.app.Sequelize.Op; const principalId = ctx.state.principalId; + const scope = await resolveScope(ctx); + const andConditions = [{ [Op.or]: [{ principal_id: principalId }, { is_system: 1 }] }]; + const visible = visibilityWhere(ctx, scope); + if (visible) andConditions.push(visible); + const rows = await ctx.model.ProductBrand.findAll({ - where: { - status: 1, - [Op.or]: [ - { principal_id: principalId }, - { is_system: 1 }, - ], - }, - attributes: [ 'id', 'name', 'code' ], + where: { status: 1, [Op.and]: andConditions }, + attributes: [ 'id', 'name', 'code', 'subsidiary_id' ], order: [[ 'sort', 'ASC' ], [ 'id', 'ASC' ]], }); ctx.body = { code: 0, message: 'success', data: rows }; @@ -89,13 +106,24 @@ class ProductBrandController extends Controller { */ async show() { const { ctx } = this; - const item = await ctx.model.ProductBrand.findByPk(ctx.params.id); + const item = await ctx.model.ProductBrand.findByPk(ctx.params.id, { + include: [ + { model: ctx.model.PrincipalSubsidiary, as: 'subsidiary', attributes: [ 'id', 'name' ], required: false }, + ], + }); if (!item) { ctx.status = 404; ctx.body = { code: 404, message: '商品品牌不存在' }; return; } - ctx.body = { code: 0, message: 'success', data: item }; + if (!isVisible(item, await resolveScope(ctx))) { + ctx.status = 403; + ctx.body = { code: 403, message: '仅可查看自己所属公司或主体级的商品品牌' }; + return; + } + const plain = item.toJSON(); + plain.subsidiary_name = plain.subsidiary ? plain.subsidiary.name : ''; + ctx.body = { code: 0, message: 'success', data: plain }; } /** @@ -119,11 +147,21 @@ class ProductBrandController extends Controller { } const Op = this.app.Sequelize.Op; - // 自定义不可与系统/本主体已有的重名:若已存在(系统或本主体)则直接复用,不再新增 + // 货主为空表示主体级;所在公司权限只能选主体或自己所属公司 + const scope = await resolveScope(ctx); + const subsidiary = await resolveSubsidiaryValue(ctx, scope, body.subsidiary_id); + if (!subsidiary.ok) { + ctx.status = subsidiary.forbidden ? 403 : 400; + ctx.body = { code: ctx.status, message: subsidiary.message }; + return; + } + + // 同一货主范围内不可重名(系统数据可直接复用) const exist = await ctx.model.ProductBrand.findOne({ where: { name, - [Op.or]: [ { principal_id: principalId }, { is_system: 1 } ], + subsidiary_id: subsidiary.value, + [Op.or]: [{ principal_id: principalId }, { is_system: 1 }], }, }); if (exist) { @@ -131,7 +169,13 @@ class ProductBrandController extends Controller { return; } - const item = await ctx.model.ProductBrand.create({ ...body, principal_id: principalId, name, is_system: 0 }); + const item = await ctx.model.ProductBrand.create({ + ...body, + principal_id: principalId, + subsidiary_id: subsidiary.value, + name, + is_system: 0, + }); ctx.body = { code: 0, message: 'success', data: { id: item.id } }; } @@ -159,8 +203,22 @@ class ProductBrandController extends Controller { return; } + const scope = await resolveScope(ctx); + if (!isVisible(item, scope)) { + ctx.status = 403; + ctx.body = { code: 403, message: '仅可修改自己所属公司或主体级的商品品牌' }; + return; + } + const body = { ...(ctx.request.body || {}) }; delete body.is_system; + const subsidiary = await resolveSubsidiaryValue(ctx, scope, body.subsidiary_id); + if (!subsidiary.ok) { + ctx.status = subsidiary.forbidden ? 403 : 400; + ctx.body = { code: ctx.status, message: subsidiary.message }; + return; + } + body.subsidiary_id = subsidiary.value; if (body.name !== undefined) { const name = String(body.name).trim(); if (!name) { @@ -168,7 +226,9 @@ class ProductBrandController extends Controller { ctx.body = { code: 400, message: '品牌名称不能为空' }; return; } - const exist = await ctx.model.ProductBrand.findOne({ where: { principal_id: item.principal_id, name } }); + const exist = await ctx.model.ProductBrand.findOne({ + where: { principal_id: item.principal_id, name, subsidiary_id: subsidiary.value }, + }); if (exist && Number(exist.id) !== Number(item.id)) { ctx.status = 400; ctx.body = { code: 400, message: `品牌「${name}」已存在` }; @@ -204,6 +264,12 @@ class ProductBrandController extends Controller { return; } + if (!isVisible(item, await resolveScope(ctx))) { + ctx.status = 403; + ctx.body = { code: 403, message: '仅可删除自己所属公司或主体级的商品品牌' }; + return; + } + const used = await ctx.model.Product.count({ where: { principal_id: item.principal_id, brand_id: item.id } }); if (used > 0) { ctx.status = 400; diff --git a/backend/app/controller/productCategory.js b/backend/app/controller/productCategory.js index 129ca19..7e97200 100644 --- a/backend/app/controller/productCategory.js +++ b/backend/app/controller/productCategory.js @@ -3,6 +3,12 @@ const { Controller } = require('egg'); const { parsePagination, buildPageResult } = require('../lib/pagination'); const { attachUsedCount } = require('../lib/attributeUsage'); +const { + resolveScope, + visibilityWhere, + resolveSubsidiaryValue, + isVisible, +} = require('../lib/productAttributeScope'); /** 商品表引用分类主键的字段名 */ const COLUMN = 'category_id'; @@ -27,32 +33,44 @@ class ProductCategoryController extends Controller { const { ctx } = this; const Op = this.app.Sequelize.Op; const { page, pageSize, offset, limit } = parsePagination(ctx.query); - const { keyword, status } = ctx.query; + const { keyword, status, subsidiary_id: subsidiaryId } = ctx.query; const principalId = ctx.state.principalId; - const where = { - [Op.or]: [ - { principal_id: principalId }, - { is_system: 1 }, - ], - }; + // 货主范围:集团权限看全部;所在公司权限仅看「主体级(无货主)+ 自己所属公司」 + const scope = await resolveScope(ctx); + const andConditions = [ + { [Op.or]: [{ principal_id: principalId }, { is_system: 1 }] }, + ]; + const visible = visibilityWhere(ctx, scope); + if (visible) andConditions.push(visible); if (keyword) { - where[Op.or] = [ - { name: { [Op.like]: `%${keyword}%` } }, - { code: { [Op.like]: `%${keyword}%` } }, - ]; + andConditions.push({ + [Op.or]: [ + { name: { [Op.like]: `%${keyword}%` } }, + { code: { [Op.like]: `%${keyword}%` } }, + ], + }); + } + if (status !== undefined && status !== '') andConditions.push({ status: Number(status) }); + // 货主筛选:0 表示主体级(无货主) + if (subsidiaryId !== undefined && subsidiaryId !== '') { + andConditions.push({ subsidiary_id: Number(subsidiaryId) === 0 ? null : Number(subsidiaryId) }); } - if (status !== undefined && status !== '') where.status = Number(status); const { count, rows } = await ctx.model.ProductCategory.findAndCountAll({ - where, + where: { [Op.and]: andConditions }, offset, limit, order: [[ 'sort', 'ASC' ], [ 'id', 'ASC' ]], + include: [ + { model: ctx.model.PrincipalSubsidiary, as: 'subsidiary', attributes: [ 'id', 'name' ], required: false }, + ], }); const list = await attachUsedCount(ctx, COLUMN, rows); - ctx.body = { code: 0, message: 'success', data: buildPageResult(list, count, { page, pageSize }) }; + // 附加扁平的货主名称(主体级为空串) + const data = list.map(row => ({ ...row, subsidiary_name: row.subsidiary ? row.subsidiary.name : '' })); + ctx.body = { code: 0, message: 'success', data: buildPageResult(data, count, { page, pageSize }) }; } /** @@ -66,15 +84,14 @@ class ProductCategoryController extends Controller { const { ctx } = this; const Op = this.app.Sequelize.Op; const principalId = ctx.state.principalId; + const scope = await resolveScope(ctx); + const andConditions = [{ [Op.or]: [{ principal_id: principalId }, { is_system: 1 }] }]; + const visible = visibilityWhere(ctx, scope); + if (visible) andConditions.push(visible); + const rows = await ctx.model.ProductCategory.findAll({ - where: { - status: 1, - [Op.or]: [ - { principal_id: principalId }, - { is_system: 1 }, - ], - }, - attributes: [ 'id', 'name', 'code' ], + where: { status: 1, [Op.and]: andConditions }, + attributes: [ 'id', 'name', 'code', 'subsidiary_id' ], order: [[ 'sort', 'ASC' ], [ 'id', 'ASC' ]], }); ctx.body = { code: 0, message: 'success', data: rows }; @@ -89,13 +106,24 @@ class ProductCategoryController extends Controller { */ async show() { const { ctx } = this; - const item = await ctx.model.ProductCategory.findByPk(ctx.params.id); + const item = await ctx.model.ProductCategory.findByPk(ctx.params.id, { + include: [ + { model: ctx.model.PrincipalSubsidiary, as: 'subsidiary', attributes: [ 'id', 'name' ], required: false }, + ], + }); if (!item) { ctx.status = 404; ctx.body = { code: 404, message: '商品分类不存在' }; return; } - ctx.body = { code: 0, message: 'success', data: item }; + if (!isVisible(item, await resolveScope(ctx))) { + ctx.status = 403; + ctx.body = { code: 403, message: '仅可查看自己所属公司或主体级的商品分类' }; + return; + } + const plain = item.toJSON(); + plain.subsidiary_name = plain.subsidiary ? plain.subsidiary.name : ''; + ctx.body = { code: 0, message: 'success', data: plain }; } /** @@ -119,11 +147,21 @@ class ProductCategoryController extends Controller { } const Op = this.app.Sequelize.Op; - // 自定义不可与系统/本主体已有的重名:若已存在(系统或本主体)则直接复用,不再新增 + // 货主为空表示主体级;所在公司权限只能选主体或自己所属公司 + const scope = await resolveScope(ctx); + const subsidiary = await resolveSubsidiaryValue(ctx, scope, body.subsidiary_id); + if (!subsidiary.ok) { + ctx.status = subsidiary.forbidden ? 403 : 400; + ctx.body = { code: ctx.status, message: subsidiary.message }; + return; + } + + // 同一货主范围内不可重名(系统数据可直接复用) const exist = await ctx.model.ProductCategory.findOne({ where: { name, - [Op.or]: [ { principal_id: principalId }, { is_system: 1 } ], + subsidiary_id: subsidiary.value, + [Op.or]: [{ principal_id: principalId }, { is_system: 1 }], }, }); if (exist) { @@ -131,7 +169,13 @@ class ProductCategoryController extends Controller { return; } - const item = await ctx.model.ProductCategory.create({ ...body, principal_id: principalId, name, is_system: 0 }); + const item = await ctx.model.ProductCategory.create({ + ...body, + principal_id: principalId, + subsidiary_id: subsidiary.value, + name, + is_system: 0, + }); ctx.body = { code: 0, message: 'success', data: { id: item.id } }; } @@ -159,8 +203,22 @@ class ProductCategoryController extends Controller { return; } + const scope = await resolveScope(ctx); + if (!isVisible(item, scope)) { + ctx.status = 403; + ctx.body = { code: 403, message: '仅可修改自己所属公司或主体级的商品分类' }; + return; + } + const body = { ...(ctx.request.body || {}) }; delete body.is_system; + const subsidiary = await resolveSubsidiaryValue(ctx, scope, body.subsidiary_id); + if (!subsidiary.ok) { + ctx.status = subsidiary.forbidden ? 403 : 400; + ctx.body = { code: ctx.status, message: subsidiary.message }; + return; + } + body.subsidiary_id = subsidiary.value; if (body.name !== undefined) { const name = String(body.name).trim(); if (!name) { @@ -168,7 +226,9 @@ class ProductCategoryController extends Controller { ctx.body = { code: 400, message: '分类名称不能为空' }; return; } - const exist = await ctx.model.ProductCategory.findOne({ where: { principal_id: item.principal_id, name } }); + const exist = await ctx.model.ProductCategory.findOne({ + where: { principal_id: item.principal_id, name, subsidiary_id: subsidiary.value }, + }); if (exist && Number(exist.id) !== Number(item.id)) { ctx.status = 400; ctx.body = { code: 400, message: `分类「${name}」已存在` }; @@ -204,6 +264,12 @@ class ProductCategoryController extends Controller { return; } + if (!isVisible(item, await resolveScope(ctx))) { + ctx.status = 403; + ctx.body = { code: 403, message: '仅可删除自己所属公司或主体级的商品分类' }; + return; + } + const used = await ctx.model.Product.count({ where: { principal_id: item.principal_id, category_id: item.id } }); if (used > 0) { ctx.status = 400; diff --git a/backend/app/controller/productUnit.js b/backend/app/controller/productUnit.js index be79f0f..78b75d8 100644 --- a/backend/app/controller/productUnit.js +++ b/backend/app/controller/productUnit.js @@ -3,6 +3,12 @@ const { Controller } = require('egg'); const { parsePagination, buildPageResult } = require('../lib/pagination'); const { attachUsedCount } = require('../lib/attributeUsage'); +const { + resolveScope, + visibilityWhere, + resolveSubsidiaryValue, + isVisible, +} = require('../lib/productAttributeScope'); /** 商品表引用单位主键的字段名 */ const COLUMN = 'unit_id'; @@ -27,32 +33,44 @@ class ProductUnitController extends Controller { const { ctx } = this; const Op = this.app.Sequelize.Op; const { page, pageSize, offset, limit } = parsePagination(ctx.query); - const { keyword, status } = ctx.query; + const { keyword, status, subsidiary_id: subsidiaryId } = ctx.query; const principalId = ctx.state.principalId; - const where = { - [Op.or]: [ - { principal_id: principalId }, - { is_system: 1 }, - ], - }; + // 货主范围:集团权限看全部;所在公司权限仅看「主体级(无货主)+ 自己所属公司」 + const scope = await resolveScope(ctx); + const andConditions = [ + { [Op.or]: [{ principal_id: principalId }, { is_system: 1 }] }, + ]; + const visible = visibilityWhere(ctx, scope); + if (visible) andConditions.push(visible); if (keyword) { - where[Op.or] = [ - { name: { [Op.like]: `%${keyword}%` } }, - { code: { [Op.like]: `%${keyword}%` } }, - ]; + andConditions.push({ + [Op.or]: [ + { name: { [Op.like]: `%${keyword}%` } }, + { code: { [Op.like]: `%${keyword}%` } }, + ], + }); + } + if (status !== undefined && status !== '') andConditions.push({ status: Number(status) }); + // 货主筛选:0 表示主体级(无货主) + if (subsidiaryId !== undefined && subsidiaryId !== '') { + andConditions.push({ subsidiary_id: Number(subsidiaryId) === 0 ? null : Number(subsidiaryId) }); } - if (status !== undefined && status !== '') where.status = Number(status); const { count, rows } = await ctx.model.ProductUnit.findAndCountAll({ - where, + where: { [Op.and]: andConditions }, offset, limit, order: [[ 'sort', 'ASC' ], [ 'id', 'ASC' ]], + include: [ + { model: ctx.model.PrincipalSubsidiary, as: 'subsidiary', attributes: [ 'id', 'name' ], required: false }, + ], }); const list = await attachUsedCount(ctx, COLUMN, rows); - ctx.body = { code: 0, message: 'success', data: buildPageResult(list, count, { page, pageSize }) }; + // 附加扁平的货主名称(主体级为空串) + const data = list.map(row => ({ ...row, subsidiary_name: row.subsidiary ? row.subsidiary.name : '' })); + ctx.body = { code: 0, message: 'success', data: buildPageResult(data, count, { page, pageSize }) }; } /** @@ -66,15 +84,14 @@ class ProductUnitController extends Controller { const { ctx } = this; const Op = this.app.Sequelize.Op; const principalId = ctx.state.principalId; + const scope = await resolveScope(ctx); + const andConditions = [{ [Op.or]: [{ principal_id: principalId }, { is_system: 1 }] }]; + const visible = visibilityWhere(ctx, scope); + if (visible) andConditions.push(visible); + const rows = await ctx.model.ProductUnit.findAll({ - where: { - status: 1, - [Op.or]: [ - { principal_id: principalId }, - { is_system: 1 }, - ], - }, - attributes: [ 'id', 'name', 'code' ], + where: { status: 1, [Op.and]: andConditions }, + attributes: [ 'id', 'name', 'code', 'subsidiary_id' ], order: [[ 'sort', 'ASC' ], [ 'id', 'ASC' ]], }); ctx.body = { code: 0, message: 'success', data: rows }; @@ -89,13 +106,24 @@ class ProductUnitController extends Controller { */ async show() { const { ctx } = this; - const item = await ctx.model.ProductUnit.findByPk(ctx.params.id); + const item = await ctx.model.ProductUnit.findByPk(ctx.params.id, { + include: [ + { model: ctx.model.PrincipalSubsidiary, as: 'subsidiary', attributes: [ 'id', 'name' ], required: false }, + ], + }); if (!item) { ctx.status = 404; ctx.body = { code: 404, message: '商品单位不存在' }; return; } - ctx.body = { code: 0, message: 'success', data: item }; + if (!isVisible(item, await resolveScope(ctx))) { + ctx.status = 403; + ctx.body = { code: 403, message: '仅可查看自己所属公司或主体级的商品单位' }; + return; + } + const plain = item.toJSON(); + plain.subsidiary_name = plain.subsidiary ? plain.subsidiary.name : ''; + ctx.body = { code: 0, message: 'success', data: plain }; } /** @@ -119,11 +147,21 @@ class ProductUnitController extends Controller { } const Op = this.app.Sequelize.Op; - // 自定义不可与系统/本主体已有的重名:若已存在(系统或本主体)则直接复用,不再新增 + // 货主为空表示主体级;所在公司权限只能选主体或自己所属公司 + const scope = await resolveScope(ctx); + const subsidiary = await resolveSubsidiaryValue(ctx, scope, body.subsidiary_id); + if (!subsidiary.ok) { + ctx.status = subsidiary.forbidden ? 403 : 400; + ctx.body = { code: ctx.status, message: subsidiary.message }; + return; + } + + // 同一货主范围内不可重名(系统数据可直接复用) const exist = await ctx.model.ProductUnit.findOne({ where: { name, - [Op.or]: [ { principal_id: principalId }, { is_system: 1 } ], + subsidiary_id: subsidiary.value, + [Op.or]: [{ principal_id: principalId }, { is_system: 1 }], }, }); if (exist) { @@ -131,7 +169,13 @@ class ProductUnitController extends Controller { return; } - const item = await ctx.model.ProductUnit.create({ ...body, principal_id: principalId, name, is_system: 0 }); + const item = await ctx.model.ProductUnit.create({ + ...body, + principal_id: principalId, + subsidiary_id: subsidiary.value, + name, + is_system: 0, + }); ctx.body = { code: 0, message: 'success', data: { id: item.id } }; } @@ -159,8 +203,22 @@ class ProductUnitController extends Controller { return; } + const scope = await resolveScope(ctx); + if (!isVisible(item, scope)) { + ctx.status = 403; + ctx.body = { code: 403, message: '仅可修改自己所属公司或主体级的商品单位' }; + return; + } + const body = { ...(ctx.request.body || {}) }; delete body.is_system; + const subsidiary = await resolveSubsidiaryValue(ctx, scope, body.subsidiary_id); + if (!subsidiary.ok) { + ctx.status = subsidiary.forbidden ? 403 : 400; + ctx.body = { code: ctx.status, message: subsidiary.message }; + return; + } + body.subsidiary_id = subsidiary.value; if (body.name !== undefined) { const name = String(body.name).trim(); if (!name) { @@ -168,7 +226,9 @@ class ProductUnitController extends Controller { ctx.body = { code: 400, message: '单位名称不能为空' }; return; } - const exist = await ctx.model.ProductUnit.findOne({ where: { principal_id: item.principal_id, name } }); + const exist = await ctx.model.ProductUnit.findOne({ + where: { principal_id: item.principal_id, name, subsidiary_id: subsidiary.value }, + }); if (exist && Number(exist.id) !== Number(item.id)) { ctx.status = 400; ctx.body = { code: 400, message: `单位「${name}」已存在` }; @@ -204,6 +264,12 @@ class ProductUnitController extends Controller { return; } + if (!isVisible(item, await resolveScope(ctx))) { + ctx.status = 403; + ctx.body = { code: 403, message: '仅可删除自己所属公司或主体级的商品单位' }; + return; + } + const used = await ctx.model.Product.count({ where: { principal_id: item.principal_id, unit_id: item.id } }); if (used > 0) { ctx.status = 400; diff --git a/backend/app/lib/productAttributeScope.js b/backend/app/lib/productAttributeScope.js new file mode 100644 index 0000000..bd07321 --- /dev/null +++ b/backend/app/lib/productAttributeScope.js @@ -0,0 +1,77 @@ +'use strict'; + +/** + * 商品属性(分类 / 品牌 / 单位)的货主(下属公司)作用域辅助。 + * + * 数据规则: + * - subsidiary_id 为 NULL 表示「主体级」属性,全集团可见可用; + * - 填写 subsidiary_id 则为该下属公司(货主)私有; + * - 集团权限可见/可维护全部;所在公司权限仅可见「主体级 + 自己所属公司」, + * 且只能把属性建到「主体级」或自己所属公司。 + */ + +/** + * 解析当前账号在该主体下的可见范围 + * @param {Egg.Context} ctx egg context(需 principalCheck 已写入 ctx.state.principalId) + * @return {Promise<{isGroup: boolean, ownCompanyIds: Array}>} 范围信息 + */ +async function resolveScope(ctx) { + const access = await ctx.service.access.resolve(ctx.userId, ctx.state.principalId); + return { isGroup: !!access.isGroup, ownCompanyIds: (access.ownCompanyIds || []).map(Number) }; +} + +/** + * 组装「主体级 + 自己所属公司」的可见条件(集团权限返回 null,表示不限制) + * @param {Object} ctx egg context + * @param {Object} scope resolveScope 的结果 + * @param {string} column 表别名限定列名,默认 subsidiary_id + * @return {Object|null} Sequelize where 片段 + */ +function visibilityWhere(ctx, scope, column = 'subsidiary_id') { + if (scope.isGroup) return null; + const Op = ctx.app.Sequelize.Op; + const or = [{ [column]: null }]; + if (scope.ownCompanyIds.length) or.push({ [column]: { [Op.in]: scope.ownCompanyIds } }); + return { [Op.or]: or }; +} + +/** + * 校验并归一化前端传入的 subsidiary_id + * @param {Object} ctx egg context + * @param {Object} scope resolveScope 的结果 + * @param {number|string|null|undefined} value 前端传入的 subsidiary_id + * @return {Promise<{ok: boolean, value?: number|null, message?: string}>} 校验结果(value 为 null 即主体级) + */ +async function resolveSubsidiaryValue(ctx, scope, value) { + // 空值表示主体级:所在公司权限同样允许 + if (value === undefined || value === null || value === '') return { ok: true, value: null }; + + const id = Number(value); + if (!Number.isInteger(id) || id <= 0) return { ok: false, message: '所属货主不合法' }; + + const subsidiary = await ctx.model.PrincipalSubsidiary.findOne({ + where: { id, principal_id: ctx.state.principalId }, + attributes: [ 'id' ], + }); + if (!subsidiary) return { ok: false, message: '所属货主不存在或不属于当前集团' }; + + if (!scope.isGroup && !scope.ownCompanyIds.includes(id)) { + return { ok: false, forbidden: true, message: '只能选择自己所属公司或主体' }; + } + return { ok: true, value: id }; +} + +/** + * 判断属性记录是否在当前账号可见范围内 + * @param {Object} item 属性 model 实例 + * @param {Object} scope resolveScope 的结果 + * @return {boolean} 是否可见 + */ +function isVisible(item, scope) { + if (!item) return false; + if (scope.isGroup) return true; + if (item.subsidiary_id === null || item.subsidiary_id === undefined) return true; + return scope.ownCompanyIds.includes(Number(item.subsidiary_id)); +} + +module.exports = { resolveScope, visibilityWhere, resolveSubsidiaryValue, isVisible }; diff --git a/backend/app/model/productBrand.js b/backend/app/model/productBrand.js index f57550e..e4016ba 100644 --- a/backend/app/model/productBrand.js +++ b/backend/app/model/productBrand.js @@ -12,6 +12,7 @@ module.exports = app => { const ProductBrand = app.model.define('product_brand', { id: { type: BIGINT.UNSIGNED, primaryKey: true, autoIncrement: true, comment: '主键' }, principal_id: { type: BIGINT.UNSIGNED, allowNull: false, comment: '所属主体ID' }, + subsidiary_id: { type: BIGINT.UNSIGNED, allowNull: true, comment: '所属货主(下属公司ID);NULL 表示主体级(全集团共用)' }, name: { type: STRING(100), allowNull: false, comment: '品牌名称' }, code: { type: STRING(50), comment: '品牌编码' }, status: { type: TINYINT, allowNull: false, defaultValue: 1, comment: '状态:1启用 0禁用' }, @@ -27,6 +28,7 @@ module.exports = app => { ProductBrand.associate = () => { app.model.ProductBrand.belongsTo(app.model.Principal, { foreignKey: 'principal_id', as: 'principal' }); + app.model.ProductBrand.belongsTo(app.model.PrincipalSubsidiary, { foreignKey: 'subsidiary_id', as: 'subsidiary' }); }; return ProductBrand; diff --git a/backend/app/model/productCategory.js b/backend/app/model/productCategory.js index 9a7e251..75961f6 100644 --- a/backend/app/model/productCategory.js +++ b/backend/app/model/productCategory.js @@ -12,6 +12,7 @@ module.exports = app => { const ProductCategory = app.model.define('product_category', { id: { type: BIGINT.UNSIGNED, primaryKey: true, autoIncrement: true, comment: '主键' }, principal_id: { type: BIGINT.UNSIGNED, allowNull: false, comment: '所属主体ID' }, + subsidiary_id: { type: BIGINT.UNSIGNED, allowNull: true, comment: '所属货主(下属公司ID);NULL 表示主体级(全集团共用)' }, name: { type: STRING(100), allowNull: false, comment: '分类名称' }, code: { type: STRING(50), comment: '分类编码' }, status: { type: TINYINT, allowNull: false, defaultValue: 1, comment: '状态:1启用 0禁用' }, @@ -27,6 +28,7 @@ module.exports = app => { ProductCategory.associate = () => { app.model.ProductCategory.belongsTo(app.model.Principal, { foreignKey: 'principal_id', as: 'principal' }); + app.model.ProductCategory.belongsTo(app.model.PrincipalSubsidiary, { foreignKey: 'subsidiary_id', as: 'subsidiary' }); }; return ProductCategory; diff --git a/backend/app/model/productUnit.js b/backend/app/model/productUnit.js index 40df474..0022a5a 100644 --- a/backend/app/model/productUnit.js +++ b/backend/app/model/productUnit.js @@ -12,6 +12,7 @@ module.exports = app => { const ProductUnit = app.model.define('product_unit', { id: { type: BIGINT.UNSIGNED, primaryKey: true, autoIncrement: true, comment: '主键' }, principal_id: { type: BIGINT.UNSIGNED, allowNull: false, comment: '所属主体ID' }, + subsidiary_id: { type: BIGINT.UNSIGNED, allowNull: true, comment: '所属货主(下属公司ID);NULL 表示主体级(全集团共用)' }, name: { type: STRING(100), allowNull: false, comment: '单位名称' }, code: { type: STRING(50), comment: '单位编码' }, status: { type: TINYINT, allowNull: false, defaultValue: 1, comment: '状态:1启用 0禁用' }, @@ -27,6 +28,7 @@ module.exports = app => { ProductUnit.associate = () => { app.model.ProductUnit.belongsTo(app.model.Principal, { foreignKey: 'principal_id', as: 'principal' }); + app.model.ProductUnit.belongsTo(app.model.PrincipalSubsidiary, { foreignKey: 'subsidiary_id', as: 'subsidiary' }); }; return ProductUnit; diff --git a/backend/app/service/exportTask.js b/backend/app/service/exportTask.js index 0121afe..0d781c6 100644 --- a/backend/app/service/exportTask.js +++ b/backend/app/service/exportTask.js @@ -44,7 +44,8 @@ class ExportTaskService extends Service { * @return {Promise} 任务实例 */ async submit(type, filters, principalId, userId) { - const { sql } = buildExportSql(type, filters, principalId, userId); + const access = await this.ctx.service.access.resolve(userId, principalId); + const { sql } = buildExportSql(type, filters, principalId, userId, access); return this.ctx.model.ExportTask.create({ principal_id: principalId, type, diff --git a/backend/app/utils/exportDefs.js b/backend/app/utils/exportDefs.js index 9cac8b8..f7c6510 100644 --- a/backend/app/utils/exportDefs.js +++ b/backend/app/utils/exportDefs.js @@ -405,6 +405,11 @@ const ATTR_COLUMNS = [ { key: 'id', header: 'ID' }, { key: 'name', header: '名称' }, { key: 'code', header: '编码' }, + { + key: 'subsidiary_name', + header: '货主', + expr: '(SELECT s.name FROM principal_subsidiaries s WHERE s.id = t.subsidiary_id)', + }, { key: 'status', header: '状态', format: labels(ENABLE_MAP) }, { key: 'sort', header: '排序' }, { key: 'is_system', header: '数据来源', format: labels(IS_SYSTEM_MAP) }, @@ -606,6 +611,7 @@ function attrType(label, table) { label, filters: [ { key: 'keyword', label: '关键词', type: 'text', placeholder: '名称 / 编码' }, + { key: 'subsidiary_id', label: '货主', type: 'subsidiary' }, { key: 'status', label: '状态', type: 'select', options: ENABLE_OPTIONS }, { key: 'is_system', label: '数据来源', type: 'select', options: IS_SYSTEM_OPTIONS }, ], @@ -615,6 +621,23 @@ function attrType(label, table) { .kw([ 't.name', 't.code' ], f.keyword) .eq('t.status', f.status) .eq('t.is_system', f.is_system); + // 货主筛选:0 表示主体级(无货主) + if (!blank(f.subsidiary_id)) { + if (Number(f.subsidiary_id) === 0) wh.raw('t.subsidiary_id IS NULL'); + else wh.eq('t.subsidiary_id', f.subsidiary_id); + } + // 所在公司权限:仅导出「主体级(无货主)+ 自己所属公司」的属性 + if (ctx.access && !ctx.access.isGroup) { + const ids = (ctx.access.ownCompanyIds || []).map(Number); + if (ids.length) { + wh.raw( + `(t.subsidiary_id IS NULL OR t.subsidiary_id IN (${ids.map(() => '?').join(',')}))`, + ...ids + ); + } else { + wh.raw('t.subsidiary_id IS NULL'); + } + } return buildResult({ columns: ATTR_COLUMNS, from: `${table} t`, wh }); }, }; @@ -1043,12 +1066,13 @@ const TYPE_LABELS = Object.keys(EXPORT_TYPES).reduce((acc, key) => { acc[key] = * @param {Object} filters 筛选条件(来自前端,键已按类型白名单过滤) * @param {number} principalId 主体ID(强制隔离) * @param {number} [userId] 提交人ID(「主体」类型按账号可见主体隔离时使用) + * @param {Object} [access] 权限范围 { isGroup, ownCompanyIds }(带 subsidiary_id 的导出类型据此收窄) * @return {{sql: string, countSql: string, columns: Array, replacements: Array}} 查询语句与列定义 */ -function buildExportSql(type, filters, principalId, userId) { +function buildExportSql(type, filters, principalId, userId, access) { const def = EXPORT_TYPES[type]; if (!def) throw new Error('不支持的导出类型: ' + type); - return def.build(filters || {}, { principalId, userId }); + return def.build(filters || {}, { principalId, userId, access }); } /** diff --git a/backend/database/migrations/20261104071000-add-subsidiary-to-product-attributes.js b/backend/database/migrations/20261104071000-add-subsidiary-to-product-attributes.js new file mode 100644 index 0000000..39941b9 --- /dev/null +++ b/backend/database/migrations/20261104071000-add-subsidiary-to-product-attributes.js @@ -0,0 +1,33 @@ +'use strict'; + +/** + * 商品属性(分类 / 品牌 / 单位)关联下属公司:三张表各增加 subsidiary_id。 + * + * NULL 表示主体级(全集团共用);填写则为某个下属公司(货主)私有。 + * 所在公司权限只能新增/维护「主体级」与「自己所属公司」的属性,列表也仅可见这两类。 + */ +const TABLES = [ 'product_categories', 'product_brands', 'product_units' ]; + +module.exports = { + async up(queryInterface, Sequelize) { + for (const table of TABLES) { + await queryInterface.addColumn(table, 'subsidiary_id', { + type: Sequelize.BIGINT.UNSIGNED, + allowNull: true, + comment: '所属货主(下属公司ID);NULL 表示主体级(全集团共用)', + references: { model: 'principal_subsidiaries', key: 'id' }, + after: 'principal_id', + }); + await queryInterface.addIndex(table, [ 'principal_id', 'subsidiary_id' ], { + name: `idx_${table}_principal_subsidiary`, + }); + } + }, + + async down(queryInterface) { + for (const table of TABLES) { + await queryInterface.removeIndex(table, `idx_${table}_principal_subsidiary`); + await queryInterface.removeColumn(table, 'subsidiary_id'); + } + }, +}; diff --git a/frontend/src/api/productBrand.ts b/frontend/src/api/productBrand.ts index aa34f42..69d45f4 100644 --- a/frontend/src/api/productBrand.ts +++ b/frontend/src/api/productBrand.ts @@ -4,6 +4,12 @@ import { get, post, put, del } from '@/utils/request' export interface ProductBrand { id: number principal_id: number + /** 所属货主(下属公司ID);null 表示主体级(全集团共用) */ + subsidiary_id: number | null + /** 所属货主名称(列表/详情接口返回,主体级为空串) */ + subsidiary_name?: string + /** 所属货主明细(列表/详情接口返回) */ + subsidiary?: { id: number; name: string } | null name: string code: string | null status: number @@ -22,9 +28,13 @@ export interface ProductAttributeOption { id: number name: string code: string | null + /** 所属货主(下属公司ID);null 表示主体级 */ + subsidiary_id?: number | null } export interface ProductBrandPayload { + /** 所属货主(下属公司ID);null/不传表示主体级 */ + subsidiary_id?: number | null name: string code?: string | null status?: number diff --git a/frontend/src/api/productCategory.ts b/frontend/src/api/productCategory.ts index 87121c2..f6e8194 100644 --- a/frontend/src/api/productCategory.ts +++ b/frontend/src/api/productCategory.ts @@ -4,6 +4,12 @@ import { get, post, put, del } from '@/utils/request' export interface ProductCategory { id: number principal_id: number + /** 所属货主(下属公司ID);null 表示主体级(全集团共用) */ + subsidiary_id: number | null + /** 所属货主名称(列表/详情接口返回,主体级为空串) */ + subsidiary_name?: string + /** 所属货主明细(列表/详情接口返回) */ + subsidiary?: { id: number; name: string } | null name: string code: string | null status: number @@ -22,9 +28,13 @@ export interface ProductAttributeOption { id: number name: string code: string | null + /** 所属货主(下属公司ID);null 表示主体级 */ + subsidiary_id?: number | null } export interface ProductCategoryPayload { + /** 所属货主(下属公司ID);null/不传表示主体级 */ + subsidiary_id?: number | null name: string code?: string | null status?: number diff --git a/frontend/src/api/productUnit.ts b/frontend/src/api/productUnit.ts index aa0797b..40a96d3 100644 --- a/frontend/src/api/productUnit.ts +++ b/frontend/src/api/productUnit.ts @@ -4,6 +4,12 @@ import { get, post, put, del } from '@/utils/request' export interface ProductUnit { id: number principal_id: number + /** 所属货主(下属公司ID);null 表示主体级(全集团共用) */ + subsidiary_id: number | null + /** 所属货主名称(列表/详情接口返回,主体级为空串) */ + subsidiary_name?: string + /** 所属货主明细(列表/详情接口返回) */ + subsidiary?: { id: number; name: string } | null name: string code: string | null status: number @@ -22,9 +28,13 @@ export interface ProductAttributeOption { id: number name: string code: string | null + /** 所属货主(下属公司ID);null 表示主体级 */ + subsidiary_id?: number | null } export interface ProductUnitPayload { + /** 所属货主(下属公司ID);null/不传表示主体级 */ + subsidiary_id?: number | null name: string code?: string | null status?: number diff --git a/frontend/src/views/ProductAttribute/ProductAttributePanel.vue b/frontend/src/views/ProductAttribute/ProductAttributePanel.vue index ffb604c..53531e3 100644 --- a/frontend/src/views/ProductAttribute/ProductAttributePanel.vue +++ b/frontend/src/views/ProductAttribute/ProductAttributePanel.vue @@ -24,6 +24,8 @@ import { updateProductUnit, deleteProductUnit, } from '@/api/productUnit' +import { getPrincipalSubsidiaryOptions, type PrincipalSubsidiaryOption } from '@/api/principalSubsidiary' +import { getAccessContext } from '@/api/access' export type AttrType = 'category' | 'brand' | 'unit' @@ -33,6 +35,10 @@ const props = defineProps<{ type: AttrType }>() interface AttrRow { id: number principal_id: number + /** 所属货主(下属公司ID);null 表示主体级 */ + subsidiary_id: number | null + /** 所属货主名称(主体级为空串) */ + subsidiary_name?: string name: string code: string | null status: number @@ -89,6 +95,7 @@ const EXPORT_TYPE: Record = { /** 导出筛选条件(与列表筛选同源) */ const exportFilters = computed(() => ({ keyword: query.keyword.trim(), + subsidiary_id: query.subsidiary_id, status: query.status, })) const exportType = computed(() => EXPORT_TYPE[props.type]) @@ -110,14 +117,35 @@ const query = reactive({ page: 1, pageSize: DEFAULT_PAGE_SIZE, keyword: '', + subsidiary_id: '' as string | number, status: '' as string | number, }) +/** 权限范围:所在公司权限只能把属性建到「主体级」或自己所属公司 */ +const isCompanyScope = ref(false) +/** 货主下拉(主体级 + 可选下属公司) */ +const subsidiaryOptions = ref([]) + +async function loadSubsidiaryOptions() { + try { + const [access, options] = await Promise.all([ + getAccessContext(), + getPrincipalSubsidiaryOptions({ mine: 1 }), + ]) + isCompanyScope.value = !access.is_group + subsidiaryOptions.value = options + } catch { + isCompanyScope.value = false + subsidiaryOptions.value = [] + } +} + const { loading, list, total, elapsed, fetchList, search, handlePageChange, handleSizeChange } = useListPage({ query, fetcher: () => { const params: Record = { ...query } if (!params.keyword) delete params.keyword + if (params.subsidiary_id === '') delete params.subsidiary_id if (params.status === '') delete params.status return api.list(params) }, @@ -125,6 +153,7 @@ const { loading, list, total, elapsed, fetchList, search, handlePageChange, hand function reset() { query.keyword = '' + query.subsidiary_id = '' query.status = '' search() } @@ -135,13 +164,14 @@ const submitting = ref(false) const formRef = ref() const editId = ref(null) const form = reactive({ + subsidiary_id: '' as number | '' | null, name: '', code: '', status: 1, sort: 0, remark: '', }) -const EMPTY_FORM = { name: '', code: '', status: 1, sort: 0, remark: '' } +const EMPTY_FORM = { subsidiary_id: '' as number | '' | null, name: '', code: '', status: 1, sort: 0, remark: '' } const rules: FormRules = { name: [{ required: true, message: `请输入${cur.nameLabel}`, trigger: 'blur' }], status: [{ required: true, message: '请选择状态', trigger: 'change' }], @@ -156,6 +186,7 @@ function openCreate() { function openEdit(row: AttrRow) { editId.value = row.id Object.assign(form, { + subsidiary_id: row.subsidiary_id ?? '', name: row.name, code: row.code || '', status: row.status, @@ -171,7 +202,10 @@ async function submitForm() { if (!valid) return submitting.value = true try { - const payload = { ...form } + const payload = { + ...form, + subsidiary_id: form.subsidiary_id === '' || form.subsidiary_id === null ? null : Number(form.subsidiary_id), + } if (editId.value == null) { await api.create(payload) ElMessage.success('新增成功') @@ -216,7 +250,10 @@ async function handleDelete(row: AttrRow) { } } -onMounted(fetchList) +onMounted(() => { + fetchList() + loadSubsidiaryOptions() +})