diff --git a/src/main/resources/templates/pages/group/group_edit_mobile.html b/src/main/resources/templates/pages/group/group_edit_mobile.html index 0b57ee52..fcb9b96d 100644 --- a/src/main/resources/templates/pages/group/group_edit_mobile.html +++ b/src/main/resources/templates/pages/group/group_edit_mobile.html @@ -103,12 +103,16 @@ lis.push("
"); for (let i = 0; i < result.length; i++) { + let brandItem = '

' + "物料品牌:" + result[i].brand + '

'; + if (result[i].brand === "") { + brandItem = ""; + } lis.push('
  • ' + result[i].mname + '

    '); lis.push('
    ' + '

    ' + "物料编码:" + result[i].mcode + '

    ' + '

    ' + "物料型号:" + result[i].version + '

    ' - + '

    ' + "物料品牌:" + result[i].brand + '

    ' + + brandItem + '

    ' + "包含数量:" + result[i].quantity + ":" + result[i].showUnit + '

    ' + '

    ' + "创建时间:" + result[i].showCreateTime + '

    ' + '
  • '); diff --git a/target/classes/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml b/target/classes/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml index e0ad3769..0fc58090 100644 --- a/target/classes/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml +++ b/target/classes/com/dreamchaser/depository_manage/mapper/DepositoryRecordMapper.xml @@ -84,6 +84,7 @@ + @@ -169,7 +170,7 @@ - airid,did,airmproducedDate,mname,quantity,price,tname,applicant_time,aircode,dname,applicant_id,applyRemark,mcode,mversion,munit,mtexture,mkingdeecode,mdepositoryCode,airUnit,flagForGroup,mid,airPlaceId,airapproverPass,airapproverTime,airapproverId,airstate,airapproverMessage,airtoGroupId,mbrand + airid,did,airmproducedDate,mname,quantity,price,tname,applicant_time,aircode,dname,applicant_id,applyRemark,mcode,mversion,munit,mtexture,mkingdeecode,mdepositoryCode,airUnit,flagForGroup,mid,airPlaceId,airapproverPass,airapproverTime,airapproverId,airstate,airapproverMessage,airtoGroupId,mbrand,pkingdeecode