Browse Source

Merge remote-tracking branch 'origin/dev' into dev

dev
王晓迪 3 months ago
parent
commit
97a109a3af
  1. 28
      ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysCustomerQuoteChild.java
  2. 10
      ruoyi-admin/src/main/resources/mapper/system/SysCustomerQuoteChildMapper.xml
  3. 2
      ruoyi-admin/src/main/resources/templates/manufacture/materialRequisitionBCP/materialRequisitionBCP.html
  4. 2
      ruoyi-admin/src/main/resources/templates/manufacture/materialRequisitionFL/materialRequisitionFL.html
  5. 2
      ruoyi-admin/src/main/resources/templates/manufacture/materialRequisitionYL/materialRequisitionYL.html
  6. 2
      ruoyi-admin/src/main/resources/templates/purchase/purchaseOrder/detail.html
  7. 2
      ruoyi-admin/src/main/resources/templates/quality/returnGoodsKhthInfo/returnGoodsKhthInfo.html
  8. 2
      ruoyi-admin/src/main/resources/templates/quality/returnGoodsScInfo/returnGoodsScInfo.html
  9. 2
      ruoyi-admin/src/main/resources/templates/stock/stockInfo/stockInfo.html
  10. 2
      ruoyi-admin/src/main/resources/templates/storehouse/warehousingInPDBcp/warehousingInPDBcp.html
  11. 2
      ruoyi-admin/src/main/resources/templates/storehouse/warehousingInPDFinishProduct/warehousingInPDFinishProduct.html
  12. 2
      ruoyi-admin/src/main/resources/templates/storehouse/warehousingInRGFinishProduct/warehousingInRGFinishProduct.html
  13. 2
      ruoyi-admin/src/main/resources/templates/system/companyInformation/companyInformation.html
  14. 2
      ruoyi-admin/src/main/resources/templates/system/customer/customer.html
  15. 4
      ruoyi-admin/src/main/resources/templates/system/customer/detail.html
  16. 4
      ruoyi-admin/src/main/resources/templates/system/customerQuote/add.html
  17. 2
      ruoyi-admin/src/main/resources/templates/system/customerQuote/customerQuote.html
  18. 1
      ruoyi-admin/src/main/resources/templates/system/customerQuote/detail.html
  19. 1
      ruoyi-admin/src/main/resources/templates/system/customerQuote/edit.html
  20. 1
      ruoyi-admin/src/main/resources/templates/system/customerQuote/taskModifyApply.html
  21. 1
      ruoyi-admin/src/main/resources/templates/system/customerQuote/taskYwjlVerify.html
  22. 1
      ruoyi-admin/src/main/resources/templates/system/customerQuote/taskYwzgVerify.html
  23. 1
      ruoyi-admin/src/main/resources/templates/system/customerQuote/taskZozjVerify.html
  24. 2
      ruoyi-admin/src/main/resources/templates/system/item/item.html
  25. 2
      ruoyi-admin/src/main/resources/templates/system/procedure/procedure.html
  26. 2
      ruoyi-admin/src/main/resources/templates/system/processCategory/processCategory.html
  27. 2
      ruoyi-admin/src/main/resources/templates/system/sop/sop.html
  28. 2
      ruoyi-admin/src/main/resources/templates/system/supplier/supplier.html
  29. 2
      ruoyi-admin/src/main/resources/templates/system/technicalTeam/technicalTeam.html
  30. 5
      ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageMakeDetail.html
  31. 6
      ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageOutOrder.html
  32. 5
      ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageOutOrderDetail.html
  33. 11
      ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storagePurchase.html
  34. 11
      ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storagePurchaseDetail.html
  35. 10
      ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storagePurchaseWarehouse.html
  36. 10
      ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storagePurchaseWarehouseDetail.html
  37. 5
      ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageRefundsExchanges.html
  38. 4
      ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageRefundsExchangesDetail.html
  39. 5
      ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/temporaryOutOrder.html
  40. 4
      ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/temporaryOutOrderDetail.html
  41. 4
      ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/temporaryPurchase.html
  42. 4
      ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/temporaryPurchaseDetail.html
  43. 7
      ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/temporaryPurchaseWarehouse.html
  44. 4
      ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/temporaryPurchaseWarehouseDetail.html

28
ruoyi-admin/src/main/java/com/ruoyi/system/domain/SysCustomerQuoteChild.java

@ -44,6 +44,15 @@ public class SysCustomerQuoteChild extends BaseEntity
@Excel(name = "物料的加工方式") @Excel(name = "物料的加工方式")
private String processMethod; private String processMethod;
/** 物料的型号 */
@Excel(name = "物料的型号")
private String materialModel;
/** 物料的单位 */
@Excel(name = "物料的单位")
private String unit;
/** 物料的品牌 */ /** 物料的品牌 */
@Excel(name = "物料的品牌") @Excel(name = "物料的品牌")
private String brand; private String brand;
@ -370,6 +379,23 @@ public class SysCustomerQuoteChild extends BaseEntity
this.recentQuotationUSD = recentQuotationUSD; 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 @Override
public String toString() { public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@ -405,6 +431,8 @@ public class SysCustomerQuoteChild extends BaseEntity
.append("delFlag", getDelFlag()) .append("delFlag", getDelFlag())
.append("recentQuotationUSD",getRecentQuotationUSD()) .append("recentQuotationUSD",getRecentQuotationUSD())
.append("recentQuotationRMB",getRecentQuotationRMB()) .append("recentQuotationRMB",getRecentQuotationRMB())
.append("materialModel",getMaterialModel())
.append("unit",getUnit())
.toString(); .toString();
} }
} }

10
ruoyi-admin/src/main/resources/mapper/system/SysCustomerQuoteChildMapper.xml

@ -12,6 +12,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="materialName" column="materialName" /> <result property="materialName" column="materialName" />
<result property="materialType" column="materialType" /> <result property="materialType" column="materialType" />
<result property="processMethod" column="processMethod" /> <result property="processMethod" column="processMethod" />
<result property="unit" column="unit" />
<result property="materialModel" column="material_model" />
<result property="brand" column="brand" /> <result property="brand" column="brand" />
<result property="photoUrl" column="photoUrl" /> <result property="photoUrl" column="photoUrl" />
<result property="describe" column="describe" /> <result property="describe" column="describe" />
@ -39,7 +41,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap> </resultMap>
<sql id="selectSysCustomerQuoteChildVo"> <sql id="selectSysCustomerQuoteChildVo">
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, countTax, usdTax, materialNum,materialSole, recentQuotation_rmb, recentQuotation_usd, materialRmb, materialNoRmb, materialNoUsd, materialUsd, materialUsdSum,
materialNoUsdSum, materialNoRmbSum, materialRmbSum, create_by, create_time, update_by, materialNoUsdSum, materialNoRmbSum, materialRmbSum, create_by, create_time, update_by,
update_time, remark, use_status,audit_status from sys_customer_quotechild update_time, remark, use_status,audit_status from sys_customer_quotechild
@ -76,6 +78,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="materialName != null">materialName,</if> <if test="materialName != null">materialName,</if>
<if test="materialType != null">materialType,</if> <if test="materialType != null">materialType,</if>
<if test="processMethod != null">processMethod,</if> <if test="processMethod != null">processMethod,</if>
<if test="unit != null">unit,</if>
<if test="materialModel != null">material_model,</if>
<if test="brand != null">brand,</if> <if test="brand != null">brand,</if>
<if test="photoUrl != null">photoUrl,</if> <if test="photoUrl != null">photoUrl,</if>
<if test="describe != null">`describe`,</if> <if test="describe != null">`describe`,</if>
@ -105,6 +109,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="materialName != null">#{materialName},</if> <if test="materialName != null">#{materialName},</if>
<if test="materialType != null">#{materialType},</if> <if test="materialType != null">#{materialType},</if>
<if test="processMethod != null">#{processMethod},</if> <if test="processMethod != null">#{processMethod},</if>
<if test="unit != null">#{unit},</if>
<if test="materialModel != null">#{materialModel},</if>
<if test="brand != null">#{brand},</if> <if test="brand != null">#{brand},</if>
<if test="photoUrl != null">#{photoUrl},</if> <if test="photoUrl != null">#{photoUrl},</if>
<if test="describe != null">#{describe},</if> <if test="describe != null">#{describe},</if>
@ -138,6 +144,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="materialName != null">materialName = #{materialName},</if> <if test="materialName != null">materialName = #{materialName},</if>
<if test="materialType != null">materialType = #{materialType},</if> <if test="materialType != null">materialType = #{materialType},</if>
<if test="processMethod != null">processMethod = #{processMethod},</if> <if test="processMethod != null">processMethod = #{processMethod},</if>
<if test="unit != null">unit = #{unit},</if>
<if test="materialModel != null">material_model = #{materialModel},</if>
<if test="brand != null">brand = #{brand},</if> <if test="brand != null">brand = #{brand},</if>
<if test="photoUrl != null">photoUrl = #{photoUrl},</if> <if test="photoUrl != null">photoUrl = #{photoUrl},</if>
<if test="describe != null">`describe` = #{describe},</if> <if test="describe != null">`describe` = #{describe},</if>

2
ruoyi-admin/src/main/resources/templates/manufacture/materialRequisitionBCP/materialRequisitionBCP.html

@ -195,7 +195,7 @@
}, },
{ {
field: 'updateInfoTime', field: 'updateInfoTime',
title: '上次修改时间', title: '上次更新时间',
formatter: function (value, row, index) { formatter: function (value, row, index) {
if (value == null) { if (value == null) {
return " "; return " ";

2
ruoyi-admin/src/main/resources/templates/manufacture/materialRequisitionFL/materialRequisitionFL.html

@ -195,7 +195,7 @@
}, },
{ {
field: 'updateInfoTime', field: 'updateInfoTime',
title: '上次修改时间', title: '上次更新时间',
formatter: function (value, row, index) { formatter: function (value, row, index) {
if (value == null) { if (value == null) {
return " "; return " ";

2
ruoyi-admin/src/main/resources/templates/manufacture/materialRequisitionYL/materialRequisitionYL.html

@ -194,7 +194,7 @@
}, },
{ {
field: 'updateInfoTime', field: 'updateInfoTime',
title: '上次修改时间', title: '上次更新时间',
formatter: function (value, row, index) { formatter: function (value, row, index) {
if (value == null) { if (value == null) {
return " "; return " ";

2
ruoyi-admin/src/main/resources/templates/purchase/purchaseOrder/detail.html

@ -197,7 +197,7 @@
}, },
{ {
title: '不含税总价', title: '不含税总价',
field: 'materialNoRmbSum', field: 'materialNormbSum',
}, },
{ {
title: '含税总价', title: '含税总价',

2
ruoyi-admin/src/main/resources/templates/quality/returnGoodsKhthInfo/returnGoodsKhthInfo.html

@ -236,7 +236,7 @@
}, },
{ {
field: 'updateInfoTime', field: 'updateInfoTime',
title: '上次修改时间', title: '上次更新时间',
formatter: function (value, row, index) { formatter: function (value, row, index) {
if (value == null) { if (value == null) {
return " "; return " ";

2
ruoyi-admin/src/main/resources/templates/quality/returnGoodsScInfo/returnGoodsScInfo.html

@ -146,7 +146,7 @@
}, },
{ {
field: 'updateInfoTime', field: 'updateInfoTime',
title: '上次修改时间', title: '上次更新时间',
formatter: function (value, row, index) { formatter: function (value, row, index) {
if (value == null) { if (value == null) {
return " "; return " ";

2
ruoyi-admin/src/main/resources/templates/stock/stockInfo/stockInfo.html

@ -101,7 +101,7 @@
// else {return value;} // else {return value;}
// } // }
}, },
{title: '上次修改时间',field: 'updateInfoTime',align: 'center', {title: '上次更新时间',field: 'updateInfoTime',align: 'center',
formatter: function (value, row, index) { formatter: function (value, row, index) {
if (value){ if (value){

2
ruoyi-admin/src/main/resources/templates/storehouse/warehousingInPDBcp/warehousingInPDBcp.html

@ -160,7 +160,7 @@
}, },
{ {
field: 'updateInfoTime', field: 'updateInfoTime',
title: '上次修改时间', title: '上次更新时间',
formatter: function (value, row, index) { formatter: function (value, row, index) {
if (value == null) { if (value == null) {
return " "; return " ";

2
ruoyi-admin/src/main/resources/templates/storehouse/warehousingInPDFinishProduct/warehousingInPDFinishProduct.html

@ -161,7 +161,7 @@
}, },
{ {
field: 'updateInfoTime', field: 'updateInfoTime',
title: '上次修改时间', title: '上次更新时间',
formatter: function (value, row, index) { formatter: function (value, row, index) {
if (value == null) { if (value == null) {
return " "; return " ";

2
ruoyi-admin/src/main/resources/templates/storehouse/warehousingInRGFinishProduct/warehousingInRGFinishProduct.html

@ -164,7 +164,7 @@
}, },
{ {
field: 'updateInfoTime', field: 'updateInfoTime',
title: '上次修改时间', title: '上次更新时间',
formatter: function (value, row, index) { formatter: function (value, row, index) {
if (value == null) { if (value == null) {
return " "; return " ";

2
ruoyi-admin/src/main/resources/templates/system/companyInformation/companyInformation.html

@ -209,7 +209,7 @@
}, },
{ {
field: 'updateInfoTime', field: 'updateInfoTime',
title: '上次修改时间', title: '上次更新时间',
formatter: function (value, row, index) { formatter: function (value, row, index) {
if (value == null) { if (value == null) {
return " "; return " ";

2
ruoyi-admin/src/main/resources/templates/system/customer/customer.html

@ -511,7 +511,7 @@
{title: '录入时间',field: 'createTime',align: 'center', {title: '录入时间',field: 'createTime',align: 'center',
sortable: true, sortable: true,
}, },
{title: '上次修改时间',field: 'updateTime',align: 'center', {title: '上次更新时间',field: 'updateTime',align: 'center',
formatter: function(value, row, index) { formatter: function(value, row, index) {
if (value) { if (value) {

4
ruoyi-admin/src/main/resources/templates/system/customer/detail.html

@ -572,7 +572,7 @@
}, },
{ {
field: 'updateInfoTime', field: 'updateInfoTime',
title: '上次修改时间', title: '上次更新时间',
formatter: function (value, row, index) { formatter: function (value, row, index) {
if (value == null) { if (value == null) {
return " "; return " ";
@ -607,7 +607,7 @@
{title: '录入时间',field: 'firstAddTime', {title: '录入时间',field: 'firstAddTime',
formatter: function (value, row, index) {if (value == null) {return " ";}else {return value;}} 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];}} formatter: function (value, row, index) {if (value == null) {return " ";} else {var vArr = value.split(','); return vArr[0];}}
}, },
] ]

4
ruoyi-admin/src/main/resources/templates/system/customerQuote/add.html

@ -323,6 +323,7 @@
} }
}, },
{ title: '描述',field: 'describe',align: 'center'}, { title: '描述',field: 'describe',align: 'center'},
{title: '型号',field: 'materialModel',align: 'center'},
{title: '品牌',field: 'brand',align: 'center'}, {title: '品牌',field: 'brand',align: 'center'},
{ title: '单位',field: 'unit',align: 'center', { title: '单位',field: 'unit',align: 'center',
formatter: function(value, row, index) { formatter: function(value, row, index) {
@ -669,8 +670,9 @@
materialName: rowData.materialName, materialName: rowData.materialName,
materialType: rowData.materialType, materialType: rowData.materialType,
describe: rowData.describe, describe: rowData.describe,
brand: rowData.brand, materialModel: rowData.materialModel,
unit: rowData.unit, unit: rowData.unit,
brand: rowData.brand,
processMethod: rowData.processMethod, processMethod: rowData.processMethod,
photoUrl: rowData.photoUrl, photoUrl: rowData.photoUrl,
countTax: '', countTax: '',

2
ruoyi-admin/src/main/resources/templates/system/customerQuote/customerQuote.html

@ -279,7 +279,7 @@
{title: '录入时间',field: 'createTime',sortable: true,align: 'center', {title: '录入时间',field: 'createTime',sortable: true,align: 'center',
}, },
{title: '更新人',field: 'updateBy',align: 'center'}, {title: '更新人',field: 'updateBy',align: 'center'},
{ title: '上次修改时间',field: 'updateTime',align: 'center', { title: '上次更新时间',field: 'updateTime',align: 'center',
}, },
{title: '备注',field: 'remark'}, {title: '备注',field: 'remark'},
{ {

1
ruoyi-admin/src/main/resources/templates/system/customerQuote/detail.html

@ -178,6 +178,7 @@
} }
}, },
{ title: '描述',field: 'describe',align: 'center'}, { title: '描述',field: 'describe',align: 'center'},
{title: '型号',field: 'materialModel',align: 'center'},
{title: '品牌',field: 'brand',align: 'center'}, {title: '品牌',field: 'brand',align: 'center'},
{ {
title: '图片', field: 'photoUrl', align: 'center', title: '图片', field: 'photoUrl', align: 'center',

1
ruoyi-admin/src/main/resources/templates/system/customerQuote/edit.html

@ -200,6 +200,7 @@
} }
}, },
{ title: '描述',field: 'describe',align: 'center'}, { title: '描述',field: 'describe',align: 'center'},
{title: '型号',field: 'materialModel',align: 'center'},
{title: '品牌',field: 'brand',align: 'center'}, {title: '品牌',field: 'brand',align: 'center'},
{ {
title: '图片', field: 'photoUrl', align: 'center', title: '图片', field: 'photoUrl', align: 'center',

1
ruoyi-admin/src/main/resources/templates/system/customerQuote/taskModifyApply.html

@ -237,6 +237,7 @@
} }
}, },
{ title: '描述',field: 'describe',align: 'center'}, { title: '描述',field: 'describe',align: 'center'},
{title: '型号',field: 'materialModel',align: 'center'},
{title: '品牌',field: 'brand',align: 'center'}, {title: '品牌',field: 'brand',align: 'center'},
{ {
title: '图片', field: 'photoUrl', align: 'center', title: '图片', field: 'photoUrl', align: 'center',

1
ruoyi-admin/src/main/resources/templates/system/customerQuote/taskYwjlVerify.html

@ -221,6 +221,7 @@
} }
}, },
{ title: '描述',field: 'describe',align: 'center'}, { title: '描述',field: 'describe',align: 'center'},
{title: '型号',field: 'materialModel',align: 'center'},
{title: '品牌',field: 'brand',align: 'center'}, {title: '品牌',field: 'brand',align: 'center'},
{ {
title: '图片', field: 'photoUrl', align: 'center', title: '图片', field: 'photoUrl', align: 'center',

1
ruoyi-admin/src/main/resources/templates/system/customerQuote/taskYwzgVerify.html

@ -243,6 +243,7 @@
} }
}, },
{ title: '描述',field: 'describe',align: 'center'}, { title: '描述',field: 'describe',align: 'center'},
{title: '型号',field: 'materialModel',align: 'center'},
{title: '品牌',field: 'brand',align: 'center'}, {title: '品牌',field: 'brand',align: 'center'},
{ {
title: '图片', field: 'photoUrl', align: 'center', title: '图片', field: 'photoUrl', align: 'center',

1
ruoyi-admin/src/main/resources/templates/system/customerQuote/taskZozjVerify.html

@ -224,6 +224,7 @@
} }
}, },
{ title: '描述',field: 'describe',align: 'center'}, { title: '描述',field: 'describe',align: 'center'},
{title: '型号',field: 'materialModel',align: 'center'},
{title: '品牌',field: 'brand',align: 'center'}, {title: '品牌',field: 'brand',align: 'center'},
{ {
title: '图片', field: 'photoUrl', align: 'center', title: '图片', field: 'photoUrl', align: 'center',

2
ruoyi-admin/src/main/resources/templates/system/item/item.html

@ -99,7 +99,7 @@
}, },
{ {
field: 'updateTime', field: 'updateTime',
title: '上次修改时间', title: '上次更新时间',
formatter: function (value, row, index) { formatter: function (value, row, index) {
if (value == null) { if (value == null) {
return " "; return " ";

2
ruoyi-admin/src/main/resources/templates/system/procedure/procedure.html

@ -101,7 +101,7 @@
{field: 'associatedItem',title: '核算数量关联项',visible: false}, {field: 'associatedItem',title: '核算数量关联项',visible: false},
{field: 'procedureRemark',title: '工序备注'}, {field: 'procedureRemark',title: '工序备注'},
{field: 'createTime',title: '录入时间'}, {field: 'createTime',title: '录入时间'},
{field: 'updateTime', title: '上次修改时间'}, {field: 'updateTime', title: '上次更新时间'},
{title: '操作',align: 'center',formatter: function(value, row, index) { {title: '操作',align: 'center',formatter: function(value, row, index) {
var actions = []; var actions = [];
actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> '); actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');

2
ruoyi-admin/src/main/resources/templates/system/processCategory/processCategory.html

@ -76,7 +76,7 @@
{field: 'standardConversionCost',title: '标准加工费'}, {field: 'standardConversionCost',title: '标准加工费'},
{field: 'actualProcessingCost',title: '财务实际加工费'}, {field: 'actualProcessingCost',title: '财务实际加工费'},
{field: 'createTime',title: '录入时间'}, {field: 'createTime',title: '录入时间'},
{field: 'updateTime',title: '上次修改时间'}, {field: 'updateTime',title: '上次更新时间'},
{title: '操作',align: 'center',formatter: function(value, row, index) { {title: '操作',align: 'center',formatter: function(value, row, index) {
var actions = []; var actions = [];
actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="#" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> '); actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="#" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');

2
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) { if (value == null) {
return " "; return " ";
} else { } else {

2
ruoyi-admin/src/main/resources/templates/system/supplier/supplier.html

@ -210,7 +210,7 @@
{ {
field: 'updateInfoTime', field: 'updateInfoTime',
title: '上次修改时间', title: '上次更新时间',
formatter: function (value, row, index) { formatter: function (value, row, index) {
if (value == null) { if (value == null) {
return " "; return " ";

2
ruoyi-admin/src/main/resources/templates/system/technicalTeam/technicalTeam.html

@ -100,7 +100,7 @@
}, },
{ {
field: 'updateTime', field: 'updateTime',
title: '上次修改时间', title: '上次更新时间',
formatter: function (value, row, index) { formatter: function (value, row, index) {
if (value == null) { if (value == null) {
return " "; return " ";

5
ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageMakeDetail.html

@ -190,6 +190,11 @@
align: 'center', align: 'center',
field: 'materialPhotourl', field: 'materialPhotourl',
}, },
{
title: '物料型号',
align: 'center',
field: 'materialModel',
},
{ {
title: '描述', title: '描述',
align: 'center', align: 'center',

6
ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageOutOrder.html

@ -115,6 +115,7 @@
"materialName": item.materialName, "materialName": item.materialName,
"materialType": item.materialType, "materialType": item.materialType,
"materialPhotourl": item.materialPhotourl, "materialPhotourl": item.materialPhotourl,
"materialModel": item.materialModel,
"materialDescribe": item.materialDescribe, "materialDescribe": item.materialDescribe,
"materialBrand": item.materialBrand, "materialBrand": item.materialBrand,
"materialUnit": item.materialUnit, "materialUnit": item.materialUnit,
@ -211,6 +212,11 @@
align: 'center', align: 'center',
field: 'materialPhotourl', field: 'materialPhotourl',
}, },
{
title: '型号',
align: 'center',
field: 'materialModel',
},
{ {
title: '描述', title: '描述',
align: 'center', align: 'center',

5
ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageOutOrderDetail.html

@ -150,6 +150,11 @@
align: 'center', align: 'center',
field: 'materialPhotourl', field: 'materialPhotourl',
}, },
{
title: '型号',
align: 'center',
field: 'materialModel',
},
{ {
title: '描述', title: '描述',
align: 'center', align: 'center',

11
ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storagePurchase.html

@ -126,6 +126,11 @@
var warehouseStorageCode = [[${warehouseStorageOrder.warehouseStorageCode}]] var warehouseStorageCode = [[${warehouseStorageOrder.warehouseStorageCode}]]
var warehouseCode = [[${warehouseStorageOrder.warehouseCode}]] var warehouseCode = [[${warehouseStorageOrder.warehouseCode}]]
var processMethodDatas = [[${@dict.getType('processMethod')}]];
var materialTypeDatas = [[${@category.getChildByCode('materialType')}]];
var prefix = ctx + "warehouse/storageOrder"; var prefix = ctx + "warehouse/storageOrder";
$("#form-storagePurchase-edit").validate({ $("#form-storagePurchase-edit").validate({
focusCleanup: true focusCleanup: true
@ -233,6 +238,9 @@
{ {
title: '物料类型', title: '物料类型',
field: 'materialType', field: 'materialType',
formatter: function(value, row, index) {
return $.table.selectCategoryLabel(materialTypeDatas, value);
}
}, },
{ {
title: '物料图片地址', title: '物料图片地址',
@ -258,6 +266,9 @@
{ {
title: '物料加工方式', title: '物料加工方式',
field: 'materialProcessMethod', field: 'materialProcessMethod',
formatter: function(value, row, index) {
return $.table.selectDictLabel(processMethodDatas, value);
}
}, },
{ {

11
ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storagePurchaseDetail.html

@ -124,6 +124,11 @@
var warehouseStorageCode = [[${warehouseStorageOrder.warehouseStorageCode}]] var warehouseStorageCode = [[${warehouseStorageOrder.warehouseStorageCode}]]
var warehouseCode = [[${warehouseStorageOrder.warehouseCode}]] var warehouseCode = [[${warehouseStorageOrder.warehouseCode}]]
var processMethodDatas = [[${@dict.getType('processMethod')}]];
var materialTypeDatas = [[${@category.getChildByCode('materialType')}]];
var prefix = ctx + "warehouse/storageOrder"; var prefix = ctx + "warehouse/storageOrder";
$("#form-storagePurchase-edit").validate({ $("#form-storagePurchase-edit").validate({
focusCleanup: true focusCleanup: true
@ -230,6 +235,9 @@
{ {
title: '物料类型', title: '物料类型',
field: 'materialType', field: 'materialType',
formatter: function(value, row, index) {
return $.table.selectCategoryLabel(materialTypeDatas, value);
}
}, },
{ {
title: '物料图片地址', title: '物料图片地址',
@ -255,6 +263,9 @@
{ {
title: '物料加工方式', title: '物料加工方式',
field: 'materialProcessMethod', field: 'materialProcessMethod',
formatter: function(value, row, index) {
return $.table.selectDictLabel(processMethodDatas, value);
}
}, },
{ {

10
ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storagePurchaseWarehouse.html

@ -124,6 +124,10 @@
var warehouseStorageCode = [[${warehouseStorageOrder.warehouseStorageCode}]] var warehouseStorageCode = [[${warehouseStorageOrder.warehouseStorageCode}]]
var warehouseCode = [[${warehouseStorageOrder.warehouseCode}]] var warehouseCode = [[${warehouseStorageOrder.warehouseCode}]]
var processMethodDatas = [[${@dict.getType('processMethod')}]];
var materialTypeDatas = [[${@category.getChildByCode('materialType')}]];
var prefix = ctx + "warehouse/storageOrder"; var prefix = ctx + "warehouse/storageOrder";
$("#form-storagePurchaseWarehouse-edit").validate({ $("#form-storagePurchaseWarehouse-edit").validate({
focusCleanup: true focusCleanup: true
@ -231,6 +235,9 @@
{ {
title: '物料类型', title: '物料类型',
field: 'materialType', field: 'materialType',
formatter: function(value, row, index) {
return $.table.selectCategoryLabel(materialTypeDatas, value);
}
}, },
{ {
title: '物料图片地址', title: '物料图片地址',
@ -256,6 +263,9 @@
{ {
title: '物料加工方式', title: '物料加工方式',
field: 'materialProcessMethod', field: 'materialProcessMethod',
formatter: function(value, row, index) {
return $.table.selectDictLabel(processMethodDatas, value);
}
}, },
{ {

10
ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storagePurchaseWarehouseDetail.html

@ -124,6 +124,10 @@
var warehouseStorageCode = [[${warehouseStorageOrder.warehouseStorageCode}]] var warehouseStorageCode = [[${warehouseStorageOrder.warehouseStorageCode}]]
var warehouseCode = [[${warehouseStorageOrder.warehouseCode}]] var warehouseCode = [[${warehouseStorageOrder.warehouseCode}]]
var processMethodDatas = [[${@dict.getType('processMethod')}]];
var materialTypeDatas = [[${@category.getChildByCode('materialType')}]];
var prefix = ctx + "warehouse/storageOrder"; var prefix = ctx + "warehouse/storageOrder";
$("#form-temporaryPurchaseWarehouse-edit").validate({ $("#form-temporaryPurchaseWarehouse-edit").validate({
focusCleanup: true focusCleanup: true
@ -229,6 +233,9 @@
{ {
title: '物料类型', title: '物料类型',
field: 'materialType', field: 'materialType',
formatter: function(value, row, index) {
return $.table.selectCategoryLabel(materialTypeDatas, value);
}
}, },
{ {
title: '物料图片地址', title: '物料图片地址',
@ -254,6 +261,9 @@
{ {
title: '物料加工方式', title: '物料加工方式',
field: 'materialProcessMethod', field: 'materialProcessMethod',
formatter: function(value, row, index) {
return $.table.selectDictLabel(processMethodDatas, value);
}
}, },
{ {

5
ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageRefundsExchanges.html

@ -123,6 +123,7 @@
"materialName": item.materialName, "materialName": item.materialName,
"materialType": item.materialType, "materialType": item.materialType,
"materialPhotourl": item.materialPhotourl, "materialPhotourl": item.materialPhotourl,
"materialModel": item.materialModel,
"materialDescribe": item.materialDescribe, "materialDescribe": item.materialDescribe,
"materialBrand": item.materialBrand, "materialBrand": item.materialBrand,
"materialUnit": item.materialUnit, "materialUnit": item.materialUnit,
@ -218,6 +219,10 @@
title: '图片', title: '图片',
field: 'materialPhotourl', field: 'materialPhotourl',
}, },
{
title: '物料型号',
field: 'materialModel',
},
{ {
title: '物料描述', title: '物料描述',
field: 'materialDescribe', field: 'materialDescribe',

4
ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageRefundsExchangesDetail.html

@ -213,6 +213,10 @@
title: '物料图片地址', title: '物料图片地址',
field: 'materialPhotourl', field: 'materialPhotourl',
}, },
{
title: '物料型号',
field: 'materialModel',
},
{ {
title: '物料描述', title: '物料描述',
field: 'materialDescribe', field: 'materialDescribe',

5
ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/temporaryOutOrder.html

@ -117,6 +117,7 @@
"materialName": item.materialName, "materialName": item.materialName,
"materialType": item.materialType, "materialType": item.materialType,
"materialPhotourl": item.materialPhotourl, "materialPhotourl": item.materialPhotourl,
"materialModel": item.materialModel,
"materialDescribe": item.materialDescribe, "materialDescribe": item.materialDescribe,
"materialBrand": item.materialBrand, "materialBrand": item.materialBrand,
"materialUnit": item.materialUnit, "materialUnit": item.materialUnit,
@ -204,6 +205,10 @@
align: 'center', align: 'center',
field: 'materialPhotourl', field: 'materialPhotourl',
}, },
{
title: '物料型号',
field: 'materialModel',
},
{ {
title: '物料描述', title: '物料描述',
align: 'center', align: 'center',

4
ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/temporaryOutOrderDetail.html

@ -145,6 +145,10 @@
align: 'center', align: 'center',
field: 'materialPhotourl', field: 'materialPhotourl',
}, },
{
title: '物料型号',
field: 'materialModel',
},
{ {
title: '描述', title: '描述',
align: 'center', align: 'center',

4
ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/temporaryPurchase.html

@ -128,6 +128,7 @@
var warehouseDeptTypeDatas = [[${@dict.getType('warehouse_dept_type')}]]; var warehouseDeptTypeDatas = [[${@dict.getType('warehouse_dept_type')}]];
var processMethodDatas = [[${@dict.getType('processMethod')}]]; var processMethodDatas = [[${@dict.getType('processMethod')}]];
var materialTypeDatas = [[${@category.getChildByCode('materialType')}]];
var prefix = ctx + "warehouse/storageOrder"; var prefix = ctx + "warehouse/storageOrder";
$("#form-temporaryPurchaseWarehouse-edit").validate({ $("#form-temporaryPurchaseWarehouse-edit").validate({
@ -232,6 +233,9 @@
{ {
title: '物料类型', title: '物料类型',
field: 'materialType', field: 'materialType',
formatter: function(value, row, index) {
return $.table.selectCategoryLabel(materialTypeDatas, value);
}
}, },
{ {
title: '物料图片地址', title: '物料图片地址',

4
ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/temporaryPurchaseDetail.html

@ -128,6 +128,7 @@
var warehouseDeptTypeDatas = [[${@dict.getType('warehouse_dept_type')}]]; var warehouseDeptTypeDatas = [[${@dict.getType('warehouse_dept_type')}]];
var processMethodDatas = [[${@dict.getType('processMethod')}]]; var processMethodDatas = [[${@dict.getType('processMethod')}]];
var materialTypeDatas = [[${@category.getChildByCode('materialType')}]];
var prefix = ctx + "warehouse/storageOrder"; var prefix = ctx + "warehouse/storageOrder";
$("#form-temporaryPurchaseWarehouse-edit").validate({ $("#form-temporaryPurchaseWarehouse-edit").validate({
@ -231,6 +232,9 @@
{ {
title: '物料类型', title: '物料类型',
field: 'materialType', field: 'materialType',
formatter: function(value, row, index) {
return $.table.selectCategoryLabel(materialTypeDatas, value);
}
}, },
{ {
title: '物料图片地址', title: '物料图片地址',

7
ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/temporaryPurchaseWarehouse.html

@ -122,9 +122,9 @@
var warehouseStorageCode = [[${warehouseStorageOrder.warehouseStorageCode}]] var warehouseStorageCode = [[${warehouseStorageOrder.warehouseStorageCode}]]
var warehouseCode = [[${warehouseStorageOrder.warehouseCode}]] var warehouseCode = [[${warehouseStorageOrder.warehouseCode}]]
var processMethodDatas = [[${@dict.getType('processMethod')}]];
var warehouseDeptTypeDatas = [[${@dict.getType('warehouse_dept_type')}]]; var warehouseDeptTypeDatas = [[${@dict.getType('warehouse_dept_type')}]];
var processMethodDatas = [[${@dict.getType('processMethod')}]];
var materialTypeDatas = [[${@category.getChildByCode('materialType')}]];
var prefix = ctx + "warehouse/storageOrder"; var prefix = ctx + "warehouse/storageOrder";
$("#form-temporaryPurchaseWarehouse-edit").validate({ $("#form-temporaryPurchaseWarehouse-edit").validate({
@ -226,6 +226,9 @@
{ {
title: '物料类型', title: '物料类型',
field: 'materialType', field: 'materialType',
formatter: function(value, row, index) {
return $.table.selectCategoryLabel(materialTypeDatas, value);
}
}, },
{ {
title: '物料图片地址', title: '物料图片地址',

4
ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/temporaryPurchaseWarehouseDetail.html

@ -126,6 +126,7 @@
var warehouseDeptTypeDatas = [[${@dict.getType('warehouse_dept_type')}]]; var warehouseDeptTypeDatas = [[${@dict.getType('warehouse_dept_type')}]];
var processMethodDatas = [[${@dict.getType('processMethod')}]]; var processMethodDatas = [[${@dict.getType('processMethod')}]];
var materialTypeDatas = [[${@category.getChildByCode('materialType')}]];
var prefix = ctx + "warehouse/storageOrder"; var prefix = ctx + "warehouse/storageOrder";
$("#form-temporaryPurchaseWarehouse-edit").validate({ $("#form-temporaryPurchaseWarehouse-edit").validate({
@ -228,6 +229,9 @@
{ {
title: '物料类型', title: '物料类型',
field: 'materialType', field: 'materialType',
formatter: function(value, row, index) {
return $.table.selectCategoryLabel(materialTypeDatas, value);
}
}, },
{ {
title: '物料图片地址', title: '物料图片地址',

Loading…
Cancel
Save