daihengshun/ArmedPolice
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

feat：完善项目

Browse Source
This commit is contained in:
henry
2021-11-19 19:11:33 +08:00
parent 83a2d64ee6
commit 7bc2feaff9
8 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/controller/manage/equipment.go
View File

@ -71,7 +71,7 @@ func (c *Equipment) tree(iModel model2.IModel, src []*model2.ManageEquipment, pa
ParentID: iModel.GetEncodeID(),
Code: v.Code,
Title: v.Title,
Image: v.Analysis(config.SettingInfo.Domain),
Image: v.Analysis(config.SystemConfig[config.Domain].(string)),
CreatedAt: v.CreatedAt,
Children: c.tree(iModel, src, v.ID),
})
@ -166,7 +166,7 @@ func (c *Equipment) Detail(id uint64) (*EquipmentDetail, error) {
out := &EquipmentDetail{
CommonIDString: basic.CommonIDString{ID: mManageEquipment.GetEncodeID()},
ManageEquipment: mManageEquipment.ManageEquipment,
Image: mManageEquipment.Analysis(config.SettingInfo.Domain),
Image: mManageEquipment.Analysis(config.SystemConfig[config.Domain].(string)),
Materials: make([]*EquipmentMaterialDetail, 0),
}
mManageEquipmentMaterial := model.NewManageEquipmentMaterial()

2
app/controller/manage/material.go
View File

@ -79,7 +79,7 @@ func (c *Material) List(manufacturerID, supplierID uint64, code, title string, p
mManageMaterial.SetID(v.ManageMaterial.ManufacturerID)
v.Stock -= v.FrozenStock
v.Image.Image = v.Analysis(config.SettingInfo.Domain)
v.Image.Image = v.Analysis(config.SystemConfig[config.Domain].(string))
list = append(list, &MaterialInfo{
CommonIDString: basic.CommonIDString{ID: v.GetEncodeID()},