diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysCustomerQuoteChild.java b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysCustomerQuoteChild.java index 4b0c5ae0..5fc915f7 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysCustomerQuoteChild.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysCustomerQuoteChild.java @@ -44,6 +44,15 @@ public class SysCustomerQuoteChild extends BaseEntity @Excel(name = "物料的加工方式") private String processMethod; + + /** 物料的型号 */ + @Excel(name = "物料的型号") + private String materialModel; + + /** 物料的单位 */ + @Excel(name = "物料的单位") + private String unit; + /** 物料的品牌 */ @Excel(name = "物料的品牌") private String brand; @@ -370,6 +379,23 @@ public class SysCustomerQuoteChild extends BaseEntity this.recentQuotationUSD = recentQuotationUSD; } + + public String getMaterialModel() { + return materialModel; + } + + public void setMaterialModel(String materialModel) { + this.materialModel = materialModel; + } + + public String getUnit() { + return unit; + } + + public void setUnit(String unit) { + this.unit = unit; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) @@ -405,6 +431,8 @@ public class SysCustomerQuoteChild extends BaseEntity .append("delFlag", getDelFlag()) .append("recentQuotationUSD",getRecentQuotationUSD()) .append("recentQuotationRMB",getRecentQuotationRMB()) + .append("materialModel",getMaterialModel()) + .append("unit",getUnit()) .toString(); } } diff --git a/ruoyi-admin/src/main/resources/mapper/system/SysCustomerQuoteChildMapper.xml b/ruoyi-admin/src/main/resources/mapper/system/SysCustomerQuoteChildMapper.xml index ff78788f..17f75aae 100644 --- a/ruoyi-admin/src/main/resources/mapper/system/SysCustomerQuoteChildMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/system/SysCustomerQuoteChildMapper.xml @@ -12,6 +12,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + @@ -39,7 +41,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select id, quoteId, materialId, materialCode, materialName, materialType, processMethod, brand, photoUrl, `describe`, + select id, quoteId, materialId, materialCode, materialName, materialType, processMethod, unit, material_model, brand, photoUrl, `describe`, countTax, usdTax, materialNum,materialSole, recentQuotation_rmb, recentQuotation_usd, materialRmb, materialNoRmb, materialNoUsd, materialUsd, materialUsdSum, materialNoUsdSum, materialNoRmbSum, materialRmbSum, create_by, create_time, update_by, update_time, remark, use_status,audit_status from sys_customer_quotechild @@ -76,6 +78,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" materialName, materialType, processMethod, + unit, + material_model, brand, photoUrl, `describe`, @@ -105,6 +109,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{materialName}, #{materialType}, #{processMethod}, + #{unit}, + #{materialModel}, #{brand}, #{photoUrl}, #{describe}, @@ -138,6 +144,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" materialName = #{materialName}, materialType = #{materialType}, processMethod = #{processMethod}, + unit = #{unit}, + material_model = #{materialModel}, brand = #{brand}, photoUrl = #{photoUrl}, `describe` = #{describe}, diff --git a/ruoyi-admin/src/main/resources/templates/manufacture/materialRequisitionBCP/materialRequisitionBCP.html b/ruoyi-admin/src/main/resources/templates/manufacture/materialRequisitionBCP/materialRequisitionBCP.html index 47102caa..fbfb6d61 100644 --- a/ruoyi-admin/src/main/resources/templates/manufacture/materialRequisitionBCP/materialRequisitionBCP.html +++ b/ruoyi-admin/src/main/resources/templates/manufacture/materialRequisitionBCP/materialRequisitionBCP.html @@ -195,7 +195,7 @@ }, { field: 'updateInfoTime', - title: '上次修改时间', + title: '上次更新时间', formatter: function (value, row, index) { if (value == null) { return " "; diff --git a/ruoyi-admin/src/main/resources/templates/manufacture/materialRequisitionFL/materialRequisitionFL.html b/ruoyi-admin/src/main/resources/templates/manufacture/materialRequisitionFL/materialRequisitionFL.html index 4c5bf0c5..520c1da5 100644 --- a/ruoyi-admin/src/main/resources/templates/manufacture/materialRequisitionFL/materialRequisitionFL.html +++ b/ruoyi-admin/src/main/resources/templates/manufacture/materialRequisitionFL/materialRequisitionFL.html @@ -195,7 +195,7 @@ }, { field: 'updateInfoTime', - title: '上次修改时间', + title: '上次更新时间', formatter: function (value, row, index) { if (value == null) { return " "; diff --git a/ruoyi-admin/src/main/resources/templates/manufacture/materialRequisitionYL/materialRequisitionYL.html b/ruoyi-admin/src/main/resources/templates/manufacture/materialRequisitionYL/materialRequisitionYL.html index fa56cec7..1791eb3a 100644 --- a/ruoyi-admin/src/main/resources/templates/manufacture/materialRequisitionYL/materialRequisitionYL.html +++ b/ruoyi-admin/src/main/resources/templates/manufacture/materialRequisitionYL/materialRequisitionYL.html @@ -194,7 +194,7 @@ }, { field: 'updateInfoTime', - title: '上次修改时间', + title: '上次更新时间', formatter: function (value, row, index) { if (value == null) { return " "; diff --git a/ruoyi-admin/src/main/resources/templates/purchase/purchaseOrder/detail.html b/ruoyi-admin/src/main/resources/templates/purchase/purchaseOrder/detail.html index 6cd8ee1d..36505a03 100644 --- a/ruoyi-admin/src/main/resources/templates/purchase/purchaseOrder/detail.html +++ b/ruoyi-admin/src/main/resources/templates/purchase/purchaseOrder/detail.html @@ -197,7 +197,7 @@ }, { title: '不含税总价', - field: 'materialNoRmbSum', + field: 'materialNormbSum', }, { title: '含税总价', diff --git a/ruoyi-admin/src/main/resources/templates/quality/returnGoodsKhthInfo/returnGoodsKhthInfo.html b/ruoyi-admin/src/main/resources/templates/quality/returnGoodsKhthInfo/returnGoodsKhthInfo.html index fbff3ed9..9da9c6bf 100644 --- a/ruoyi-admin/src/main/resources/templates/quality/returnGoodsKhthInfo/returnGoodsKhthInfo.html +++ b/ruoyi-admin/src/main/resources/templates/quality/returnGoodsKhthInfo/returnGoodsKhthInfo.html @@ -236,7 +236,7 @@ }, { field: 'updateInfoTime', - title: '上次修改时间', + title: '上次更新时间', formatter: function (value, row, index) { if (value == null) { return " "; diff --git a/ruoyi-admin/src/main/resources/templates/quality/returnGoodsScInfo/returnGoodsScInfo.html b/ruoyi-admin/src/main/resources/templates/quality/returnGoodsScInfo/returnGoodsScInfo.html index d9b2fe79..5d162c1e 100644 --- a/ruoyi-admin/src/main/resources/templates/quality/returnGoodsScInfo/returnGoodsScInfo.html +++ b/ruoyi-admin/src/main/resources/templates/quality/returnGoodsScInfo/returnGoodsScInfo.html @@ -146,7 +146,7 @@ }, { field: 'updateInfoTime', - title: '上次修改时间', + title: '上次更新时间', formatter: function (value, row, index) { if (value == null) { return " "; diff --git a/ruoyi-admin/src/main/resources/templates/stock/stockInfo/stockInfo.html b/ruoyi-admin/src/main/resources/templates/stock/stockInfo/stockInfo.html index 24248056..cde5e1f0 100644 --- a/ruoyi-admin/src/main/resources/templates/stock/stockInfo/stockInfo.html +++ b/ruoyi-admin/src/main/resources/templates/stock/stockInfo/stockInfo.html @@ -101,7 +101,7 @@ // else {return value;} // } }, - {title: '上次修改时间',field: 'updateInfoTime',align: 'center', + {title: '上次更新时间',field: 'updateInfoTime',align: 'center', formatter: function (value, row, index) { if (value){ diff --git a/ruoyi-admin/src/main/resources/templates/storehouse/warehousingInPDBcp/warehousingInPDBcp.html b/ruoyi-admin/src/main/resources/templates/storehouse/warehousingInPDBcp/warehousingInPDBcp.html index f96a1b64..2d79edc5 100644 --- a/ruoyi-admin/src/main/resources/templates/storehouse/warehousingInPDBcp/warehousingInPDBcp.html +++ b/ruoyi-admin/src/main/resources/templates/storehouse/warehousingInPDBcp/warehousingInPDBcp.html @@ -160,7 +160,7 @@ }, { field: 'updateInfoTime', - title: '上次修改时间', + title: '上次更新时间', formatter: function (value, row, index) { if (value == null) { return " "; diff --git a/ruoyi-admin/src/main/resources/templates/storehouse/warehousingInPDFinishProduct/warehousingInPDFinishProduct.html b/ruoyi-admin/src/main/resources/templates/storehouse/warehousingInPDFinishProduct/warehousingInPDFinishProduct.html index 43206e2f..64d6def1 100644 --- a/ruoyi-admin/src/main/resources/templates/storehouse/warehousingInPDFinishProduct/warehousingInPDFinishProduct.html +++ b/ruoyi-admin/src/main/resources/templates/storehouse/warehousingInPDFinishProduct/warehousingInPDFinishProduct.html @@ -161,7 +161,7 @@ }, { field: 'updateInfoTime', - title: '上次修改时间', + title: '上次更新时间', formatter: function (value, row, index) { if (value == null) { return " "; diff --git a/ruoyi-admin/src/main/resources/templates/storehouse/warehousingInRGFinishProduct/warehousingInRGFinishProduct.html b/ruoyi-admin/src/main/resources/templates/storehouse/warehousingInRGFinishProduct/warehousingInRGFinishProduct.html index 359e2f4c..b7a4bbbc 100644 --- a/ruoyi-admin/src/main/resources/templates/storehouse/warehousingInRGFinishProduct/warehousingInRGFinishProduct.html +++ b/ruoyi-admin/src/main/resources/templates/storehouse/warehousingInRGFinishProduct/warehousingInRGFinishProduct.html @@ -164,7 +164,7 @@ }, { field: 'updateInfoTime', - title: '上次修改时间', + title: '上次更新时间', formatter: function (value, row, index) { if (value == null) { return " "; diff --git a/ruoyi-admin/src/main/resources/templates/system/companyInformation/companyInformation.html b/ruoyi-admin/src/main/resources/templates/system/companyInformation/companyInformation.html index 1e0a7350..1d495dbe 100644 --- a/ruoyi-admin/src/main/resources/templates/system/companyInformation/companyInformation.html +++ b/ruoyi-admin/src/main/resources/templates/system/companyInformation/companyInformation.html @@ -209,7 +209,7 @@ }, { field: 'updateInfoTime', - title: '上次修改时间', + title: '上次更新时间', formatter: function (value, row, index) { if (value == null) { return " "; diff --git a/ruoyi-admin/src/main/resources/templates/system/customer/customer.html b/ruoyi-admin/src/main/resources/templates/system/customer/customer.html index 73bb22bb..877ac10e 100644 --- a/ruoyi-admin/src/main/resources/templates/system/customer/customer.html +++ b/ruoyi-admin/src/main/resources/templates/system/customer/customer.html @@ -511,7 +511,7 @@ {title: '录入时间',field: 'createTime',align: 'center', sortable: true, }, - {title: '上次修改时间',field: 'updateTime',align: 'center', + {title: '上次更新时间',field: 'updateTime',align: 'center', formatter: function(value, row, index) { if (value) { diff --git a/ruoyi-admin/src/main/resources/templates/system/customer/detail.html b/ruoyi-admin/src/main/resources/templates/system/customer/detail.html index b2835643..82eb730c 100644 --- a/ruoyi-admin/src/main/resources/templates/system/customer/detail.html +++ b/ruoyi-admin/src/main/resources/templates/system/customer/detail.html @@ -572,7 +572,7 @@ }, { field: 'updateInfoTime', - title: '上次修改时间', + title: '上次更新时间', formatter: function (value, row, index) { if (value == null) { return " "; @@ -607,7 +607,7 @@ {title: '录入时间',field: 'firstAddTime', formatter: function (value, row, index) {if (value == null) {return " ";}else {return value;}} }, - {title: '上次修改时间',field: 'updateInfoTime', + {title: '上次更新时间',field: 'updateInfoTime', formatter: function (value, row, index) {if (value == null) {return " ";} else {var vArr = value.split(','); return vArr[0];}} }, ] diff --git a/ruoyi-admin/src/main/resources/templates/system/customerQuote/add.html b/ruoyi-admin/src/main/resources/templates/system/customerQuote/add.html index 9a7d6d98..52b22364 100644 --- a/ruoyi-admin/src/main/resources/templates/system/customerQuote/add.html +++ b/ruoyi-admin/src/main/resources/templates/system/customerQuote/add.html @@ -323,6 +323,7 @@ } }, { title: '描述',field: 'describe',align: 'center'}, + {title: '型号',field: 'materialModel',align: 'center'}, {title: '品牌',field: 'brand',align: 'center'}, { title: '单位',field: 'unit',align: 'center', formatter: function(value, row, index) { @@ -669,8 +670,9 @@ materialName: rowData.materialName, materialType: rowData.materialType, describe: rowData.describe, - brand: rowData.brand, + materialModel: rowData.materialModel, unit: rowData.unit, + brand: rowData.brand, processMethod: rowData.processMethod, photoUrl: rowData.photoUrl, countTax: '', diff --git a/ruoyi-admin/src/main/resources/templates/system/customerQuote/customerQuote.html b/ruoyi-admin/src/main/resources/templates/system/customerQuote/customerQuote.html index d2337c89..8dc5c899 100644 --- a/ruoyi-admin/src/main/resources/templates/system/customerQuote/customerQuote.html +++ b/ruoyi-admin/src/main/resources/templates/system/customerQuote/customerQuote.html @@ -279,7 +279,7 @@ {title: '录入时间',field: 'createTime',sortable: true,align: 'center', }, {title: '更新人',field: 'updateBy',align: 'center'}, - { title: '上次修改时间',field: 'updateTime',align: 'center', + { title: '上次更新时间',field: 'updateTime',align: 'center', }, {title: '备注',field: 'remark'}, { diff --git a/ruoyi-admin/src/main/resources/templates/system/customerQuote/detail.html b/ruoyi-admin/src/main/resources/templates/system/customerQuote/detail.html index dce53ca2..59eb77e7 100644 --- a/ruoyi-admin/src/main/resources/templates/system/customerQuote/detail.html +++ b/ruoyi-admin/src/main/resources/templates/system/customerQuote/detail.html @@ -178,6 +178,7 @@ } }, { title: '描述',field: 'describe',align: 'center'}, + {title: '型号',field: 'materialModel',align: 'center'}, {title: '品牌',field: 'brand',align: 'center'}, { title: '图片', field: 'photoUrl', align: 'center', diff --git a/ruoyi-admin/src/main/resources/templates/system/customerQuote/edit.html b/ruoyi-admin/src/main/resources/templates/system/customerQuote/edit.html index 02b8e8e5..530d776f 100644 --- a/ruoyi-admin/src/main/resources/templates/system/customerQuote/edit.html +++ b/ruoyi-admin/src/main/resources/templates/system/customerQuote/edit.html @@ -200,6 +200,7 @@ } }, { title: '描述',field: 'describe',align: 'center'}, + {title: '型号',field: 'materialModel',align: 'center'}, {title: '品牌',field: 'brand',align: 'center'}, { title: '图片', field: 'photoUrl', align: 'center', diff --git a/ruoyi-admin/src/main/resources/templates/system/customerQuote/taskModifyApply.html b/ruoyi-admin/src/main/resources/templates/system/customerQuote/taskModifyApply.html index 6defaf81..c4437cf0 100644 --- a/ruoyi-admin/src/main/resources/templates/system/customerQuote/taskModifyApply.html +++ b/ruoyi-admin/src/main/resources/templates/system/customerQuote/taskModifyApply.html @@ -237,6 +237,7 @@ } }, { title: '描述',field: 'describe',align: 'center'}, + {title: '型号',field: 'materialModel',align: 'center'}, {title: '品牌',field: 'brand',align: 'center'}, { title: '图片', field: 'photoUrl', align: 'center', diff --git a/ruoyi-admin/src/main/resources/templates/system/customerQuote/taskYwjlVerify.html b/ruoyi-admin/src/main/resources/templates/system/customerQuote/taskYwjlVerify.html index 0c1eabbd..a80e50c5 100644 --- a/ruoyi-admin/src/main/resources/templates/system/customerQuote/taskYwjlVerify.html +++ b/ruoyi-admin/src/main/resources/templates/system/customerQuote/taskYwjlVerify.html @@ -221,6 +221,7 @@ } }, { title: '描述',field: 'describe',align: 'center'}, + {title: '型号',field: 'materialModel',align: 'center'}, {title: '品牌',field: 'brand',align: 'center'}, { title: '图片', field: 'photoUrl', align: 'center', diff --git a/ruoyi-admin/src/main/resources/templates/system/customerQuote/taskYwzgVerify.html b/ruoyi-admin/src/main/resources/templates/system/customerQuote/taskYwzgVerify.html index c8fb80b4..ad5c03b1 100644 --- a/ruoyi-admin/src/main/resources/templates/system/customerQuote/taskYwzgVerify.html +++ b/ruoyi-admin/src/main/resources/templates/system/customerQuote/taskYwzgVerify.html @@ -243,6 +243,7 @@ } }, { title: '描述',field: 'describe',align: 'center'}, + {title: '型号',field: 'materialModel',align: 'center'}, {title: '品牌',field: 'brand',align: 'center'}, { title: '图片', field: 'photoUrl', align: 'center', diff --git a/ruoyi-admin/src/main/resources/templates/system/customerQuote/taskZozjVerify.html b/ruoyi-admin/src/main/resources/templates/system/customerQuote/taskZozjVerify.html index 7cc4f053..d3bc7032 100644 --- a/ruoyi-admin/src/main/resources/templates/system/customerQuote/taskZozjVerify.html +++ b/ruoyi-admin/src/main/resources/templates/system/customerQuote/taskZozjVerify.html @@ -224,6 +224,7 @@ } }, { title: '描述',field: 'describe',align: 'center'}, + {title: '型号',field: 'materialModel',align: 'center'}, {title: '品牌',field: 'brand',align: 'center'}, { title: '图片', field: 'photoUrl', align: 'center', diff --git a/ruoyi-admin/src/main/resources/templates/system/item/item.html b/ruoyi-admin/src/main/resources/templates/system/item/item.html index beb1fca0..8219bc8a 100644 --- a/ruoyi-admin/src/main/resources/templates/system/item/item.html +++ b/ruoyi-admin/src/main/resources/templates/system/item/item.html @@ -99,7 +99,7 @@ }, { field: 'updateTime', - title: '上次修改时间', + title: '上次更新时间', formatter: function (value, row, index) { if (value == null) { return " "; diff --git a/ruoyi-admin/src/main/resources/templates/system/procedure/procedure.html b/ruoyi-admin/src/main/resources/templates/system/procedure/procedure.html index 9f2f125c..99e41d68 100644 --- a/ruoyi-admin/src/main/resources/templates/system/procedure/procedure.html +++ b/ruoyi-admin/src/main/resources/templates/system/procedure/procedure.html @@ -101,7 +101,7 @@ {field: 'associatedItem',title: '核算数量关联项',visible: false}, {field: 'procedureRemark',title: '工序备注'}, {field: 'createTime',title: '录入时间'}, - {field: 'updateTime', title: '上次修改时间'}, + {field: 'updateTime', title: '上次更新时间'}, {title: '操作',align: 'center',formatter: function(value, row, index) { var actions = []; actions.push('编辑 '); diff --git a/ruoyi-admin/src/main/resources/templates/system/processCategory/processCategory.html b/ruoyi-admin/src/main/resources/templates/system/processCategory/processCategory.html index fd2a016a..334de092 100644 --- a/ruoyi-admin/src/main/resources/templates/system/processCategory/processCategory.html +++ b/ruoyi-admin/src/main/resources/templates/system/processCategory/processCategory.html @@ -76,7 +76,7 @@ {field: 'standardConversionCost',title: '标准加工费'}, {field: 'actualProcessingCost',title: '财务实际加工费'}, {field: 'createTime',title: '录入时间'}, - {field: 'updateTime',title: '上次修改时间'}, + {field: 'updateTime',title: '上次更新时间'}, {title: '操作',align: 'center',formatter: function(value, row, index) { var actions = []; actions.push('编辑 '); diff --git a/ruoyi-admin/src/main/resources/templates/system/sop/sop.html b/ruoyi-admin/src/main/resources/templates/system/sop/sop.html index 0a33968e..6c1cb0a2 100644 --- a/ruoyi-admin/src/main/resources/templates/system/sop/sop.html +++ b/ruoyi-admin/src/main/resources/templates/system/sop/sop.html @@ -202,7 +202,7 @@ } } }, - {field: 'updateTime',title: '上次修改时间',formatter: function (value, row, index) { + {field: 'updateTime',title: '上次更新时间',formatter: function (value, row, index) { if (value == null) { return " "; } else { diff --git a/ruoyi-admin/src/main/resources/templates/system/supplier/supplier.html b/ruoyi-admin/src/main/resources/templates/system/supplier/supplier.html index 0ca5de27..d5386e0b 100644 --- a/ruoyi-admin/src/main/resources/templates/system/supplier/supplier.html +++ b/ruoyi-admin/src/main/resources/templates/system/supplier/supplier.html @@ -210,7 +210,7 @@ { field: 'updateInfoTime', - title: '上次修改时间', + title: '上次更新时间', formatter: function (value, row, index) { if (value == null) { return " "; diff --git a/ruoyi-admin/src/main/resources/templates/system/technicalTeam/technicalTeam.html b/ruoyi-admin/src/main/resources/templates/system/technicalTeam/technicalTeam.html index 31b4acd1..09be6cbd 100644 --- a/ruoyi-admin/src/main/resources/templates/system/technicalTeam/technicalTeam.html +++ b/ruoyi-admin/src/main/resources/templates/system/technicalTeam/technicalTeam.html @@ -100,7 +100,7 @@ }, { field: 'updateTime', - title: '上次修改时间', + title: '上次更新时间', formatter: function (value, row, index) { if (value == null) { return " "; diff --git a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageMakeDetail.html b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageMakeDetail.html index 21597d30..1920d9c5 100644 --- a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageMakeDetail.html +++ b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageMakeDetail.html @@ -190,6 +190,11 @@ align: 'center', field: 'materialPhotourl', }, + { + title: '物料型号', + align: 'center', + field: 'materialModel', + }, { title: '描述', align: 'center', diff --git a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageOutOrder.html b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageOutOrder.html index 02acd434..cb3f88c7 100644 --- a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageOutOrder.html +++ b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageOutOrder.html @@ -115,6 +115,7 @@ "materialName": item.materialName, "materialType": item.materialType, "materialPhotourl": item.materialPhotourl, + "materialModel": item.materialModel, "materialDescribe": item.materialDescribe, "materialBrand": item.materialBrand, "materialUnit": item.materialUnit, @@ -211,6 +212,11 @@ align: 'center', field: 'materialPhotourl', }, + { + title: '型号', + align: 'center', + field: 'materialModel', + }, { title: '描述', align: 'center', diff --git a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageOutOrderDetail.html b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageOutOrderDetail.html index d7b97f45..bc09630e 100644 --- a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageOutOrderDetail.html +++ b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageOutOrderDetail.html @@ -150,6 +150,11 @@ align: 'center', field: 'materialPhotourl', }, + { + title: '型号', + align: 'center', + field: 'materialModel', + }, { title: '描述', align: 'center', diff --git a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storagePurchase.html b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storagePurchase.html index ad9847a6..a3bee18f 100644 --- a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storagePurchase.html +++ b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storagePurchase.html @@ -126,6 +126,11 @@ var warehouseStorageCode = [[${warehouseStorageOrder.warehouseStorageCode}]] var warehouseCode = [[${warehouseStorageOrder.warehouseCode}]] + + var processMethodDatas = [[${@dict.getType('processMethod')}]]; + var materialTypeDatas = [[${@category.getChildByCode('materialType')}]]; + + var prefix = ctx + "warehouse/storageOrder"; $("#form-storagePurchase-edit").validate({ focusCleanup: true @@ -233,6 +238,9 @@ { title: '物料类型', field: 'materialType', + formatter: function(value, row, index) { + return $.table.selectCategoryLabel(materialTypeDatas, value); + } }, { title: '物料图片地址', @@ -258,6 +266,9 @@ { title: '物料加工方式', field: 'materialProcessMethod', + formatter: function(value, row, index) { + return $.table.selectDictLabel(processMethodDatas, value); + } }, { diff --git a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storagePurchaseDetail.html b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storagePurchaseDetail.html index 4ee5f345..1ba829e8 100644 --- a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storagePurchaseDetail.html +++ b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storagePurchaseDetail.html @@ -124,6 +124,11 @@ var warehouseStorageCode = [[${warehouseStorageOrder.warehouseStorageCode}]] var warehouseCode = [[${warehouseStorageOrder.warehouseCode}]] + + var processMethodDatas = [[${@dict.getType('processMethod')}]]; + var materialTypeDatas = [[${@category.getChildByCode('materialType')}]]; + + var prefix = ctx + "warehouse/storageOrder"; $("#form-storagePurchase-edit").validate({ focusCleanup: true @@ -230,6 +235,9 @@ { title: '物料类型', field: 'materialType', + formatter: function(value, row, index) { + return $.table.selectCategoryLabel(materialTypeDatas, value); + } }, { title: '物料图片地址', @@ -255,6 +263,9 @@ { title: '物料加工方式', field: 'materialProcessMethod', + formatter: function(value, row, index) { + return $.table.selectDictLabel(processMethodDatas, value); + } }, { diff --git a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storagePurchaseWarehouse.html b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storagePurchaseWarehouse.html index afb90a21..8b6fe56c 100644 --- a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storagePurchaseWarehouse.html +++ b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storagePurchaseWarehouse.html @@ -124,6 +124,10 @@ var warehouseStorageCode = [[${warehouseStorageOrder.warehouseStorageCode}]] var warehouseCode = [[${warehouseStorageOrder.warehouseCode}]] + + var processMethodDatas = [[${@dict.getType('processMethod')}]]; + var materialTypeDatas = [[${@category.getChildByCode('materialType')}]]; + var prefix = ctx + "warehouse/storageOrder"; $("#form-storagePurchaseWarehouse-edit").validate({ focusCleanup: true @@ -231,6 +235,9 @@ { title: '物料类型', field: 'materialType', + formatter: function(value, row, index) { + return $.table.selectCategoryLabel(materialTypeDatas, value); + } }, { title: '物料图片地址', @@ -256,6 +263,9 @@ { title: '物料加工方式', field: 'materialProcessMethod', + formatter: function(value, row, index) { + return $.table.selectDictLabel(processMethodDatas, value); + } }, { diff --git a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storagePurchaseWarehouseDetail.html b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storagePurchaseWarehouseDetail.html index 14aa1c04..01502a37 100644 --- a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storagePurchaseWarehouseDetail.html +++ b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storagePurchaseWarehouseDetail.html @@ -124,6 +124,10 @@ var warehouseStorageCode = [[${warehouseStorageOrder.warehouseStorageCode}]] var warehouseCode = [[${warehouseStorageOrder.warehouseCode}]] + + var processMethodDatas = [[${@dict.getType('processMethod')}]]; + var materialTypeDatas = [[${@category.getChildByCode('materialType')}]]; + var prefix = ctx + "warehouse/storageOrder"; $("#form-temporaryPurchaseWarehouse-edit").validate({ focusCleanup: true @@ -229,6 +233,9 @@ { title: '物料类型', field: 'materialType', + formatter: function(value, row, index) { + return $.table.selectCategoryLabel(materialTypeDatas, value); + } }, { title: '物料图片地址', @@ -254,6 +261,9 @@ { title: '物料加工方式', field: 'materialProcessMethod', + formatter: function(value, row, index) { + return $.table.selectDictLabel(processMethodDatas, value); + } }, { diff --git a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageRefundsExchanges.html b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageRefundsExchanges.html index cae94a8c..d27bdf4b 100644 --- a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageRefundsExchanges.html +++ b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageRefundsExchanges.html @@ -123,6 +123,7 @@ "materialName": item.materialName, "materialType": item.materialType, "materialPhotourl": item.materialPhotourl, + "materialModel": item.materialModel, "materialDescribe": item.materialDescribe, "materialBrand": item.materialBrand, "materialUnit": item.materialUnit, @@ -218,6 +219,10 @@ title: '图片', field: 'materialPhotourl', }, + { + title: '物料型号', + field: 'materialModel', + }, { title: '物料描述', field: 'materialDescribe', diff --git a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageRefundsExchangesDetail.html b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageRefundsExchangesDetail.html index c1d2cd23..d87c3f0b 100644 --- a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageRefundsExchangesDetail.html +++ b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageRefundsExchangesDetail.html @@ -213,6 +213,10 @@ title: '物料图片地址', field: 'materialPhotourl', }, + { + title: '物料型号', + field: 'materialModel', + }, { title: '物料描述', field: 'materialDescribe', diff --git a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/temporaryOutOrder.html b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/temporaryOutOrder.html index a5b58e41..08e90f5e 100644 --- a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/temporaryOutOrder.html +++ b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/temporaryOutOrder.html @@ -117,6 +117,7 @@ "materialName": item.materialName, "materialType": item.materialType, "materialPhotourl": item.materialPhotourl, + "materialModel": item.materialModel, "materialDescribe": item.materialDescribe, "materialBrand": item.materialBrand, "materialUnit": item.materialUnit, @@ -204,6 +205,10 @@ align: 'center', field: 'materialPhotourl', }, + { + title: '物料型号', + field: 'materialModel', + }, { title: '物料描述', align: 'center', diff --git a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/temporaryOutOrderDetail.html b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/temporaryOutOrderDetail.html index ed76f722..f7d68936 100644 --- a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/temporaryOutOrderDetail.html +++ b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/temporaryOutOrderDetail.html @@ -145,6 +145,10 @@ align: 'center', field: 'materialPhotourl', }, + { + title: '物料型号', + field: 'materialModel', + }, { title: '描述', align: 'center', diff --git a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/temporaryPurchase.html b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/temporaryPurchase.html index d129f157..66c1ea0e 100644 --- a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/temporaryPurchase.html +++ b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/temporaryPurchase.html @@ -128,6 +128,7 @@ var warehouseDeptTypeDatas = [[${@dict.getType('warehouse_dept_type')}]]; var processMethodDatas = [[${@dict.getType('processMethod')}]]; + var materialTypeDatas = [[${@category.getChildByCode('materialType')}]]; var prefix = ctx + "warehouse/storageOrder"; $("#form-temporaryPurchaseWarehouse-edit").validate({ @@ -232,6 +233,9 @@ { title: '物料类型', field: 'materialType', + formatter: function(value, row, index) { + return $.table.selectCategoryLabel(materialTypeDatas, value); + } }, { title: '物料图片地址', diff --git a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/temporaryPurchaseDetail.html b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/temporaryPurchaseDetail.html index bf17f661..6a701c71 100644 --- a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/temporaryPurchaseDetail.html +++ b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/temporaryPurchaseDetail.html @@ -128,6 +128,7 @@ var warehouseDeptTypeDatas = [[${@dict.getType('warehouse_dept_type')}]]; var processMethodDatas = [[${@dict.getType('processMethod')}]]; + var materialTypeDatas = [[${@category.getChildByCode('materialType')}]]; var prefix = ctx + "warehouse/storageOrder"; $("#form-temporaryPurchaseWarehouse-edit").validate({ @@ -231,6 +232,9 @@ { title: '物料类型', field: 'materialType', + formatter: function(value, row, index) { + return $.table.selectCategoryLabel(materialTypeDatas, value); + } }, { title: '物料图片地址', diff --git a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/temporaryPurchaseWarehouse.html b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/temporaryPurchaseWarehouse.html index 6fb67c11..189f1543 100644 --- a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/temporaryPurchaseWarehouse.html +++ b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/temporaryPurchaseWarehouse.html @@ -122,9 +122,9 @@ var warehouseStorageCode = [[${warehouseStorageOrder.warehouseStorageCode}]] var warehouseCode = [[${warehouseStorageOrder.warehouseCode}]] - var processMethodDatas = [[${@dict.getType('processMethod')}]]; - var warehouseDeptTypeDatas = [[${@dict.getType('warehouse_dept_type')}]]; + var processMethodDatas = [[${@dict.getType('processMethod')}]]; + var materialTypeDatas = [[${@category.getChildByCode('materialType')}]]; var prefix = ctx + "warehouse/storageOrder"; $("#form-temporaryPurchaseWarehouse-edit").validate({ @@ -226,6 +226,9 @@ { title: '物料类型', field: 'materialType', + formatter: function(value, row, index) { + return $.table.selectCategoryLabel(materialTypeDatas, value); + } }, { title: '物料图片地址', diff --git a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/temporaryPurchaseWarehouseDetail.html b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/temporaryPurchaseWarehouseDetail.html index b4be4347..f2b20c47 100644 --- a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/temporaryPurchaseWarehouseDetail.html +++ b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/temporaryPurchaseWarehouseDetail.html @@ -126,6 +126,7 @@ var warehouseDeptTypeDatas = [[${@dict.getType('warehouse_dept_type')}]]; var processMethodDatas = [[${@dict.getType('processMethod')}]]; + var materialTypeDatas = [[${@category.getChildByCode('materialType')}]]; var prefix = ctx + "warehouse/storageOrder"; $("#form-temporaryPurchaseWarehouse-edit").validate({ @@ -228,6 +229,9 @@ { title: '物料类型', field: 'materialType', + formatter: function(value, row, index) { + return $.table.selectCategoryLabel(materialTypeDatas, value); + } }, { title: '物料图片地址',