diff --git a/ruoyi-admin/src/main/java/com/ruoyi/erp/domain/ErpBom.java b/ruoyi-admin/src/main/java/com/ruoyi/erp/domain/ErpBom.java index 43e0dba0..9af1ff44 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/erp/domain/ErpBom.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/erp/domain/ErpBom.java @@ -46,7 +46,7 @@ public class ErpBom extends BaseEntity /** 加工方式 */ - @Excel(name = "半成品类型",sort = 8,dictType = "processMethod") + @Excel(name = "加工方式",sort = 8,dictType = "processMethod") private String processMethod; /** 单位 */ diff --git a/ruoyi-admin/src/main/resources/templates/aftersales/complaintNotice/materialSelect.html b/ruoyi-admin/src/main/resources/templates/aftersales/complaintNotice/materialSelect.html index 9be7be03..c7ec029c 100644 --- a/ruoyi-admin/src/main/resources/templates/aftersales/complaintNotice/materialSelect.html +++ b/ruoyi-admin/src/main/resources/templates/aftersales/complaintNotice/materialSelect.html @@ -56,7 +56,7 @@ field: 'materialUnit', }, { - title: '半成品类型', + title: '加工方式', field: 'materialProcessMethod', }, diff --git a/ruoyi-admin/src/main/resources/templates/erp/bom/add.html b/ruoyi-admin/src/main/resources/templates/erp/bom/add.html index 356d11f3..002f4850 100644 --- a/ruoyi-admin/src/main/resources/templates/erp/bom/add.html +++ b/ruoyi-admin/src/main/resources/templates/erp/bom/add.html @@ -40,7 +40,7 @@
- +
@@ -220,7 +220,7 @@ { field: 'processMethod', align: 'center', - title: '半成品类型', + title: '加工方式', formatter: function(value, row, index) { return $.table.selectDictLabel(processMethodDatas, value); } diff --git a/ruoyi-admin/src/main/resources/templates/erp/bom/edit.html b/ruoyi-admin/src/main/resources/templates/erp/bom/edit.html index 84d1c0e5..c6dfb296 100644 --- a/ruoyi-admin/src/main/resources/templates/erp/bom/edit.html +++ b/ruoyi-admin/src/main/resources/templates/erp/bom/edit.html @@ -37,7 +37,7 @@
- +
- +
- +
- +
- +
diff --git a/ruoyi-admin/src/main/resources/templates/erp/inboundOrder/processInboundDetail.html b/ruoyi-admin/src/main/resources/templates/erp/inboundOrder/processInboundDetail.html index afcf4ad5..9b15646a 100644 --- a/ruoyi-admin/src/main/resources/templates/erp/inboundOrder/processInboundDetail.html +++ b/ruoyi-admin/src/main/resources/templates/erp/inboundOrder/processInboundDetail.html @@ -128,7 +128,7 @@ { field: 'processMethod', align: 'center', - title: '半成品类型', + title: '加工方式', formatter: function(value, row, index) { return $.table.selectDictLabel(processMethodDatas, value); } @@ -260,7 +260,7 @@ { field: 'processMethod', - title: '半成品类型', + title: '加工方式', formatter: function(value, row, index) { return $.table.selectDictLabel(processMethodDatas, value); } diff --git a/ruoyi-admin/src/main/resources/templates/erp/inboundOrder/produceInboundDetail.html b/ruoyi-admin/src/main/resources/templates/erp/inboundOrder/produceInboundDetail.html index 2de8ceb4..16cbee3e 100644 --- a/ruoyi-admin/src/main/resources/templates/erp/inboundOrder/produceInboundDetail.html +++ b/ruoyi-admin/src/main/resources/templates/erp/inboundOrder/produceInboundDetail.html @@ -127,7 +127,7 @@ { field: 'processMethod', align: 'center', - title: '半成品类型', + title: '加工方式', formatter: function(value, row, index) { return $.table.selectDictLabel(processMethodDatas, value); } @@ -277,7 +277,7 @@ { field: 'processMethod', - title: '半成品类型', + title: '加工方式', formatter: function(value, row, index) { return $.table.selectDictLabel(processMethodDatas, value); } diff --git a/ruoyi-admin/src/main/resources/templates/erp/materialReturnInspection/add.html b/ruoyi-admin/src/main/resources/templates/erp/materialReturnInspection/add.html index 585db5c2..5eee0c3a 100644 --- a/ruoyi-admin/src/main/resources/templates/erp/materialReturnInspection/add.html +++ b/ruoyi-admin/src/main/resources/templates/erp/materialReturnInspection/add.html @@ -172,7 +172,7 @@ { field: 'processMethod', align: 'center', - title: '半成品类型', + title: '加工方式', formatter: function(value, row, index) { var curIndex = index; var columnInput = $.common.sprintf("", curIndex, value); diff --git a/ruoyi-admin/src/main/resources/templates/erp/materialReturnInspection/detail.html b/ruoyi-admin/src/main/resources/templates/erp/materialReturnInspection/detail.html index f6a0c10e..c5e7b0c5 100644 --- a/ruoyi-admin/src/main/resources/templates/erp/materialReturnInspection/detail.html +++ b/ruoyi-admin/src/main/resources/templates/erp/materialReturnInspection/detail.html @@ -162,7 +162,7 @@ { field: 'processMethod', align: 'center', - title: '半成品类型', + title: '加工方式', formatter: function(value, row, index) { return $.table.selectDictLabel(processMethodDatas, value); } diff --git a/ruoyi-admin/src/main/resources/templates/erp/materialReturnInspection/edit.html b/ruoyi-admin/src/main/resources/templates/erp/materialReturnInspection/edit.html index d0ab6a9d..9cb0a348 100644 --- a/ruoyi-admin/src/main/resources/templates/erp/materialReturnInspection/edit.html +++ b/ruoyi-admin/src/main/resources/templates/erp/materialReturnInspection/edit.html @@ -192,7 +192,7 @@ { field: 'processMethod', align: 'center', - title: '半成品类型', + title: '加工方式', formatter: function(value, row, index) { var curIndex = index; var columnInput = $.common.sprintf("", curIndex, value); diff --git a/ruoyi-admin/src/main/resources/templates/erp/materialReturnInspectionDetail/add.html b/ruoyi-admin/src/main/resources/templates/erp/materialReturnInspectionDetail/add.html index d966f0db..be049760 100644 --- a/ruoyi-admin/src/main/resources/templates/erp/materialReturnInspectionDetail/add.html +++ b/ruoyi-admin/src/main/resources/templates/erp/materialReturnInspectionDetail/add.html @@ -47,7 +47,7 @@
- +
diff --git a/ruoyi-admin/src/main/resources/templates/erp/materialReturnInspectionDetail/edit.html b/ruoyi-admin/src/main/resources/templates/erp/materialReturnInspectionDetail/edit.html index f4715d74..1c14f245 100644 --- a/ruoyi-admin/src/main/resources/templates/erp/materialReturnInspectionDetail/edit.html +++ b/ruoyi-admin/src/main/resources/templates/erp/materialReturnInspectionDetail/edit.html @@ -42,7 +42,7 @@
- +
diff --git a/ruoyi-admin/src/main/resources/templates/erp/materialReturnInspectionDetail/materialReturnInspectionDetail.html b/ruoyi-admin/src/main/resources/templates/erp/materialReturnInspectionDetail/materialReturnInspectionDetail.html index 46309ac3..3a8512b7 100644 --- a/ruoyi-admin/src/main/resources/templates/erp/materialReturnInspectionDetail/materialReturnInspectionDetail.html +++ b/ruoyi-admin/src/main/resources/templates/erp/materialReturnInspectionDetail/materialReturnInspectionDetail.html @@ -30,7 +30,7 @@
  • - +
  • @@ -155,7 +155,7 @@ field: 'materialType', }, { - title: '半成品类型', + title: '加工方式', field: 'processMethod', }, { diff --git a/ruoyi-admin/src/main/resources/templates/purchase/purchasePlan/add.html b/ruoyi-admin/src/main/resources/templates/purchase/purchasePlan/add.html index 526da708..fc42524e 100644 --- a/ruoyi-admin/src/main/resources/templates/purchase/purchasePlan/add.html +++ b/ruoyi-admin/src/main/resources/templates/purchase/purchasePlan/add.html @@ -98,7 +98,7 @@ }, {field: 'describe',title: '描述',}, {field: 'brand',title: '品牌',}, - {field: 'processMethod',title: '半成品类型', + {field: 'processMethod',title: '加工方式', formatter: function(value, row, index) {return $.table.selectDictLabel(processMethodDatas, value);} }, {field: 'unit',title: '单位', diff --git a/ruoyi-admin/src/main/resources/templates/purchase/purchaseQuote/add.html b/ruoyi-admin/src/main/resources/templates/purchase/purchaseQuote/add.html index 76e67e96..ca20d3ee 100644 --- a/ruoyi-admin/src/main/resources/templates/purchase/purchaseQuote/add.html +++ b/ruoyi-admin/src/main/resources/templates/purchase/purchaseQuote/add.html @@ -155,7 +155,7 @@ return $.table.selectDictLabel(sysUnitClassData, value); } }, - {title: '半成品类型',field: 'processMethod',align: 'center', + {title: '加工方式',field: 'processMethod',align: 'center', formatter: function(value, row, index) { return $.table.selectDictLabel(processMethodData, value); } diff --git a/ruoyi-admin/src/main/resources/templates/purchase/purchaseQuote/detail.html b/ruoyi-admin/src/main/resources/templates/purchase/purchaseQuote/detail.html index 85ce9568..5869e0e6 100644 --- a/ruoyi-admin/src/main/resources/templates/purchase/purchaseQuote/detail.html +++ b/ruoyi-admin/src/main/resources/templates/purchase/purchaseQuote/detail.html @@ -197,7 +197,7 @@ return $.table.selectDictLabel(sysUnitClassDatas, value); } }, - {title: '半成品类型',field: 'processMethod',align: 'center', + {title: '加工方式',field: 'processMethod',align: 'center', formatter: function(value, row, index) { return $.table.selectDictLabel(processMethodDatas, value); } diff --git a/ruoyi-admin/src/main/resources/templates/purchase/purchaseQuote/edit.html b/ruoyi-admin/src/main/resources/templates/purchase/purchaseQuote/edit.html index cd658d06..91435206 100644 --- a/ruoyi-admin/src/main/resources/templates/purchase/purchaseQuote/edit.html +++ b/ruoyi-admin/src/main/resources/templates/purchase/purchaseQuote/edit.html @@ -205,7 +205,7 @@ return $.table.selectDictLabel(sysUnitClassDatas, value); } }, - {title: '半成品类型',field: 'processMethod',align: 'center', + {title: '加工方式',field: 'processMethod',align: 'center', formatter: function(value, row, index) { return $.table.selectDictLabel(processMethodDatas, value); } diff --git a/ruoyi-admin/src/main/resources/templates/purchase/purchaseQuote/taskCgjlVerify.html b/ruoyi-admin/src/main/resources/templates/purchase/purchaseQuote/taskCgjlVerify.html index b8e0c88d..ec98dd45 100644 --- a/ruoyi-admin/src/main/resources/templates/purchase/purchaseQuote/taskCgjlVerify.html +++ b/ruoyi-admin/src/main/resources/templates/purchase/purchaseQuote/taskCgjlVerify.html @@ -240,7 +240,7 @@ return $.table.selectDictLabel(sysUnitClassDatas, value); } }, - {title: '半成品类型',field: 'processMethod',align: 'center', + {title: '加工方式',field: 'processMethod',align: 'center', formatter: function(value, row, index) { return $.table.selectDictLabel(processMethodDatas, value); } diff --git a/ruoyi-admin/src/main/resources/templates/purchase/purchaseQuote/taskFzjlVerify.html b/ruoyi-admin/src/main/resources/templates/purchase/purchaseQuote/taskFzjlVerify.html index 70a39820..ea5db1bb 100644 --- a/ruoyi-admin/src/main/resources/templates/purchase/purchaseQuote/taskFzjlVerify.html +++ b/ruoyi-admin/src/main/resources/templates/purchase/purchaseQuote/taskFzjlVerify.html @@ -240,7 +240,7 @@ return $.table.selectDictLabel(sysUnitClassDatas, value); } }, - {title: '半成品类型',field: 'processMethod',align: 'center', + {title: '加工方式',field: 'processMethod',align: 'center', formatter: function(value, row, index) { return $.table.selectDictLabel(processMethodDatas, value); } diff --git a/ruoyi-admin/src/main/resources/templates/purchase/purchaseQuote/taskModifyApply.html b/ruoyi-admin/src/main/resources/templates/purchase/purchaseQuote/taskModifyApply.html index 298829ef..56ef0032 100644 --- a/ruoyi-admin/src/main/resources/templates/purchase/purchaseQuote/taskModifyApply.html +++ b/ruoyi-admin/src/main/resources/templates/purchase/purchaseQuote/taskModifyApply.html @@ -223,7 +223,7 @@ return $.table.selectDictLabel(sysUnitClassDatas, value); } }, - {title: '半成品类型',field: 'processMethod',align: 'center', + {title: '加工方式',field: 'processMethod',align: 'center', formatter: function(value, row, index) { return $.table.selectDictLabel(processMethodDatas, value); } diff --git a/ruoyi-admin/src/main/resources/templates/purchase/purchaseQuoteChild/add.html b/ruoyi-admin/src/main/resources/templates/purchase/purchaseQuoteChild/add.html index ea9fb8fd..aab577b3 100644 --- a/ruoyi-admin/src/main/resources/templates/purchase/purchaseQuoteChild/add.html +++ b/ruoyi-admin/src/main/resources/templates/purchase/purchaseQuoteChild/add.html @@ -42,7 +42,7 @@
  • - +
    diff --git a/ruoyi-admin/src/main/resources/templates/purchase/purchaseQuoteChild/purchaseQuoteChild.html b/ruoyi-admin/src/main/resources/templates/purchase/purchaseQuoteChild/purchaseQuoteChild.html index 889f68a1..89718f4f 100644 --- a/ruoyi-admin/src/main/resources/templates/purchase/purchaseQuoteChild/purchaseQuoteChild.html +++ b/ruoyi-admin/src/main/resources/templates/purchase/purchaseQuoteChild/purchaseQuoteChild.html @@ -38,7 +38,7 @@
  • - +
  • diff --git a/ruoyi-admin/src/main/resources/templates/quality/complaintNotice/returnInspectionProcessing.html b/ruoyi-admin/src/main/resources/templates/quality/complaintNotice/returnInspectionProcessing.html index 359970b8..78192768 100644 --- a/ruoyi-admin/src/main/resources/templates/quality/complaintNotice/returnInspectionProcessing.html +++ b/ruoyi-admin/src/main/resources/templates/quality/complaintNotice/returnInspectionProcessing.html @@ -291,7 +291,7 @@ field: 'materialDescribe', }, { - title: '半成品类型', + title: '加工方式', field: 'materialProcessMethod', }, { diff --git a/ruoyi-admin/src/main/resources/templates/quality/manufacturingCheckout/materialSelect.html b/ruoyi-admin/src/main/resources/templates/quality/manufacturingCheckout/materialSelect.html index 01ce16e9..fcbf203e 100644 --- a/ruoyi-admin/src/main/resources/templates/quality/manufacturingCheckout/materialSelect.html +++ b/ruoyi-admin/src/main/resources/templates/quality/manufacturingCheckout/materialSelect.html @@ -69,7 +69,7 @@ field: 'materialUnit', }, { - title: '半成品类型', + title: '加工方式', field: 'materialProcessMethod', formatter: function(value, row, index) { return $.table.selectDictLabel(processMethodDatas, value); diff --git a/ruoyi-admin/src/main/resources/templates/quality/returnInspection/detail.html b/ruoyi-admin/src/main/resources/templates/quality/returnInspection/detail.html index 2981339d..5882ad7a 100644 --- a/ruoyi-admin/src/main/resources/templates/quality/returnInspection/detail.html +++ b/ruoyi-admin/src/main/resources/templates/quality/returnInspection/detail.html @@ -162,7 +162,7 @@ { field: 'processMethod', align: 'center', - title: '半成品类型', + title: '加工方式', formatter: function(value, row, index) { return $.table.selectDictLabel(processMethodDatas, value); } diff --git a/ruoyi-admin/src/main/resources/templates/quality/returnInspection/edit.html b/ruoyi-admin/src/main/resources/templates/quality/returnInspection/edit.html index d0ab6a9d..9cb0a348 100644 --- a/ruoyi-admin/src/main/resources/templates/quality/returnInspection/edit.html +++ b/ruoyi-admin/src/main/resources/templates/quality/returnInspection/edit.html @@ -192,7 +192,7 @@ { field: 'processMethod', align: 'center', - title: '半成品类型', + title: '加工方式', formatter: function(value, row, index) { var curIndex = index; var columnInput = $.common.sprintf("", curIndex, value); diff --git a/ruoyi-admin/src/main/resources/templates/quality/returnInspection/returnInspectionProcessing.html b/ruoyi-admin/src/main/resources/templates/quality/returnInspection/returnInspectionProcessing.html index 5d6c3d2e..ffc027ca 100644 --- a/ruoyi-admin/src/main/resources/templates/quality/returnInspection/returnInspectionProcessing.html +++ b/ruoyi-admin/src/main/resources/templates/quality/returnInspection/returnInspectionProcessing.html @@ -192,7 +192,7 @@ { field: 'processMethod', align: 'center', - title: '半成品类型', + title: '加工方式', formatter: function(value, row, index) { var curIndex = index; var columnInput = $.common.sprintf("", curIndex, value); diff --git a/ruoyi-admin/src/main/resources/templates/system/empRequisiteOrder/add.html b/ruoyi-admin/src/main/resources/templates/system/empRequisiteOrder/add.html index 71570720..b093131d 100644 --- a/ruoyi-admin/src/main/resources/templates/system/empRequisiteOrder/add.html +++ b/ruoyi-admin/src/main/resources/templates/system/empRequisiteOrder/add.html @@ -113,7 +113,7 @@ return $.table.selectDictLabel(sysUnitClassDatas, value); } }, - {title: '半成品类型',field: 'processMethod',align: 'center',visible: false, + {title: '加工方式',field: 'processMethod',align: 'center',visible: false, formatter: function(value, row, index) { return $.table.selectDictLabel(processMethodDatas, value); } diff --git a/ruoyi-admin/src/main/resources/templates/system/empRequisiteOrder/detail.html b/ruoyi-admin/src/main/resources/templates/system/empRequisiteOrder/detail.html index eb308109..09f40c25 100644 --- a/ruoyi-admin/src/main/resources/templates/system/empRequisiteOrder/detail.html +++ b/ruoyi-admin/src/main/resources/templates/system/empRequisiteOrder/detail.html @@ -108,7 +108,7 @@ return $.table.selectDictLabel(sysUnitClassDatas, value); } }, - {title: '半成品类型',field: 'processMethod',align: 'center',visible: false, + {title: '加工方式',field: 'processMethod',align: 'center',visible: false, formatter: function(value, row, index) { return $.table.selectDictLabel(processMethodDatas, value); } diff --git a/ruoyi-admin/src/main/resources/templates/system/empRequisiteOrder/edit.html b/ruoyi-admin/src/main/resources/templates/system/empRequisiteOrder/edit.html index 85cfc2c9..a247c7ff 100644 --- a/ruoyi-admin/src/main/resources/templates/system/empRequisiteOrder/edit.html +++ b/ruoyi-admin/src/main/resources/templates/system/empRequisiteOrder/edit.html @@ -111,7 +111,7 @@ return $.table.selectDictLabel(sysUnitClassDatas, value); } }, - {title: '半成品类型',field: 'processMethod',align: 'center',visible: false, + {title: '加工方式',field: 'processMethod',align: 'center',visible: false, formatter: function(value, row, index) { return $.table.selectDictLabel(processMethodDatas, value); } diff --git a/ruoyi-admin/src/main/resources/templates/system/empRequisiteOrder/taskBmjlVerify.html b/ruoyi-admin/src/main/resources/templates/system/empRequisiteOrder/taskBmjlVerify.html index a6df97a8..8d62ca6e 100644 --- a/ruoyi-admin/src/main/resources/templates/system/empRequisiteOrder/taskBmjlVerify.html +++ b/ruoyi-admin/src/main/resources/templates/system/empRequisiteOrder/taskBmjlVerify.html @@ -132,7 +132,7 @@ return $.table.selectDictLabel(sysUnitClassDatas, value); } }, - {title: '半成品类型',field: 'processMethod',align: 'center', + {title: '加工方式',field: 'processMethod',align: 'center', formatter: function(value, row, index) { return $.table.selectDictLabel(processMethodDatas, value); } diff --git a/ruoyi-admin/src/main/resources/templates/system/empRequisiteOrder/taskBmzgVerify.html b/ruoyi-admin/src/main/resources/templates/system/empRequisiteOrder/taskBmzgVerify.html index a11de6fd..6843236c 100644 --- a/ruoyi-admin/src/main/resources/templates/system/empRequisiteOrder/taskBmzgVerify.html +++ b/ruoyi-admin/src/main/resources/templates/system/empRequisiteOrder/taskBmzgVerify.html @@ -133,7 +133,7 @@ return $.table.selectDictLabel(sysUnitClassDatas, value); } }, - {title: '半成品类型',field: 'processMethod',align: 'center', + {title: '加工方式',field: 'processMethod',align: 'center', formatter: function(value, row, index) { return $.table.selectDictLabel(processMethodDatas, value); } diff --git a/ruoyi-admin/src/main/resources/templates/system/empRequisiteOrder/taskFzjlVerify.html b/ruoyi-admin/src/main/resources/templates/system/empRequisiteOrder/taskFzjlVerify.html index cc01bdce..79ef4478 100644 --- a/ruoyi-admin/src/main/resources/templates/system/empRequisiteOrder/taskFzjlVerify.html +++ b/ruoyi-admin/src/main/resources/templates/system/empRequisiteOrder/taskFzjlVerify.html @@ -132,7 +132,7 @@ return $.table.selectDictLabel(sysUnitClassDatas, value); } }, - {title: '半成品类型',field: 'processMethod',align: 'center', + {title: '加工方式',field: 'processMethod',align: 'center', formatter: function(value, row, index) { return $.table.selectDictLabel(processMethodDatas, value); } diff --git a/ruoyi-admin/src/main/resources/templates/system/empRequisiteOrder/taskYfzjVerify.html b/ruoyi-admin/src/main/resources/templates/system/empRequisiteOrder/taskYfzjVerify.html index 3e5e002a..5091bf2f 100644 --- a/ruoyi-admin/src/main/resources/templates/system/empRequisiteOrder/taskYfzjVerify.html +++ b/ruoyi-admin/src/main/resources/templates/system/empRequisiteOrder/taskYfzjVerify.html @@ -132,7 +132,7 @@ return $.table.selectDictLabel(sysUnitClassDatas, value); } }, - {title: '半成品类型',field: 'processMethod',align: 'center', + {title: '加工方式',field: 'processMethod',align: 'center', formatter: function(value, row, index) { return $.table.selectDictLabel(processMethodDatas, value); } diff --git a/ruoyi-admin/src/main/resources/templates/system/makeorder/addOutsourcePlan.html b/ruoyi-admin/src/main/resources/templates/system/makeorder/addOutsourcePlan.html index fe0cc1a4..46f0ae01 100644 --- a/ruoyi-admin/src/main/resources/templates/system/makeorder/addOutsourcePlan.html +++ b/ruoyi-admin/src/main/resources/templates/system/makeorder/addOutsourcePlan.html @@ -133,7 +133,7 @@ { field: 'processMethod', align: 'center', - title: '半成品类型', + title: '加工方式', formatter: function(value, row, index) { return $.table.selectDictLabel(processMethodDatas, value); } diff --git a/ruoyi-admin/src/main/resources/templates/system/makeorder/addProcessInbound.html b/ruoyi-admin/src/main/resources/templates/system/makeorder/addProcessInbound.html index 50ddce86..14e8d1ec 100644 --- a/ruoyi-admin/src/main/resources/templates/system/makeorder/addProcessInbound.html +++ b/ruoyi-admin/src/main/resources/templates/system/makeorder/addProcessInbound.html @@ -93,7 +93,7 @@ }, {field: 'brand',align: 'center',title: '品牌'}, {field: 'describe',align: 'center',title: '描述'}, - {field: 'processMethod',align: 'center',title: '半成品类型', + {field: 'processMethod',align: 'center',title: '加工方式', formatter: function(value, row, index) { return $.table.selectDictLabel(processMethodDatas, value); } @@ -153,7 +153,7 @@ {field: 'describe',title: '描述',}, {field: 'brand', title: '品牌',}, {field: 'unit',title: '单位',}, - {field: 'processMethod',title: '半成品类型', + {field: 'processMethod',title: '加工方式', formatter: function(value, row, index) { return $.table.selectDictLabel(processMethodDatas, value); } diff --git a/ruoyi-admin/src/main/resources/templates/system/makeorder/addpick.html b/ruoyi-admin/src/main/resources/templates/system/makeorder/addpick.html index cfd45f8c..04530ef3 100644 --- a/ruoyi-admin/src/main/resources/templates/system/makeorder/addpick.html +++ b/ruoyi-admin/src/main/resources/templates/system/makeorder/addpick.html @@ -149,7 +149,7 @@ { field: 'processMethod', align: 'center', - title: '半成品类型', + title: '加工方式', formatter: function(value, row, index) { return $.table.selectDictLabel(processMethodDatas, value); } diff --git a/ruoyi-admin/src/main/resources/templates/system/makeorder/bmps.html b/ruoyi-admin/src/main/resources/templates/system/makeorder/bmps.html index bad2c977..b0b83d10 100644 --- a/ruoyi-admin/src/main/resources/templates/system/makeorder/bmps.html +++ b/ruoyi-admin/src/main/resources/templates/system/makeorder/bmps.html @@ -145,7 +145,7 @@ { field: 'processMethod', align: 'center', - title: '半成品类型', + title: '加工方式', formatter: function(value, row, index) { return $.table.selectDictLabel(processMethodDatas, value); } @@ -277,7 +277,7 @@ // // { // field: 'processMethod', - // title: '半成品类型', + // title: '加工方式', // formatter: function(value, row, index) { // return $.table.selectDictLabel(processMethodDatas, value); // } diff --git a/ruoyi-admin/src/main/resources/templates/system/makeorder/bmzgqr.html b/ruoyi-admin/src/main/resources/templates/system/makeorder/bmzgqr.html index ead4e5c6..cf8df0aa 100644 --- a/ruoyi-admin/src/main/resources/templates/system/makeorder/bmzgqr.html +++ b/ruoyi-admin/src/main/resources/templates/system/makeorder/bmzgqr.html @@ -140,7 +140,7 @@ { field: 'processMethod', align: 'center', - title: '半成品类型', + title: '加工方式', formatter: function(value, row, index) { return $.table.selectDictLabel(processMethodDatas, value); } @@ -272,7 +272,7 @@ // // { // field: 'processMethod', - // title: '半成品类型', + // title: '加工方式', // formatter: function(value, row, index) { // return $.table.selectDictLabel(processMethodDatas, value); // } diff --git a/ruoyi-admin/src/main/resources/templates/system/makeorder/cgsh.html b/ruoyi-admin/src/main/resources/templates/system/makeorder/cgsh.html index 828b4e46..7d37c0aa 100644 --- a/ruoyi-admin/src/main/resources/templates/system/makeorder/cgsh.html +++ b/ruoyi-admin/src/main/resources/templates/system/makeorder/cgsh.html @@ -140,7 +140,7 @@ { field: 'processMethod', align: 'center', - title: '半成品类型', + title: '加工方式', formatter:function (value, row, index) { return processMethodFormatter(value,row,index); } diff --git a/ruoyi-admin/src/main/resources/templates/system/makeorder/detail.html b/ruoyi-admin/src/main/resources/templates/system/makeorder/detail.html index 17232d72..c159622d 100644 --- a/ruoyi-admin/src/main/resources/templates/system/makeorder/detail.html +++ b/ruoyi-admin/src/main/resources/templates/system/makeorder/detail.html @@ -138,7 +138,7 @@ { field: 'processMethod', align: 'center', - title: '半成品类型', + title: '加工方式', formatter: function(value, row, index) { return $.table.selectDictLabel(processMethodDatas, value); } @@ -286,7 +286,7 @@ { field: 'processMethod', align: 'center', - title: '半成品类型', + title: '加工方式', formatter: function(value, row, index) { return $.table.selectDictLabel(processMethodDatas, value); } diff --git a/ruoyi-admin/src/main/resources/templates/system/makeorder/editMakeOrderBom.html b/ruoyi-admin/src/main/resources/templates/system/makeorder/editMakeOrderBom.html index 86642b4b..77f767f3 100644 --- a/ruoyi-admin/src/main/resources/templates/system/makeorder/editMakeOrderBom.html +++ b/ruoyi-admin/src/main/resources/templates/system/makeorder/editMakeOrderBom.html @@ -39,7 +39,7 @@
  • - +