diff --git a/ruoyi-admin/src/main/resources/templates/erp/bom/bom.html b/ruoyi-admin/src/main/resources/templates/erp/bom/bom.html index 39a49fb4..22bbfdbe 100644 --- a/ruoyi-admin/src/main/resources/templates/erp/bom/bom.html +++ b/ruoyi-admin/src/main/resources/templates/erp/bom/bom.html @@ -24,7 +24,7 @@
  • - @@ -32,7 +32,6 @@ -
  • @@ -48,9 +47,12 @@
  • +
  • - +
  • @@ -112,6 +114,21 @@ var loginName = currentUser.loginName; var prefix = ctx + "erp/bom"; $(function() { + $.ajax({ + url: ctx + 'erp/material/getEngineerList', + type: 'get', + success: function (res) { + if (res.rows.length > 0) { + var usertData = res.rows; + for (let i in usertData) { + $("select[name='businessMembers']").append( + ""); + } + } else { + $.modal.msgError(res.msg); + } + } + }); var options = { url: prefix + "/list", createUrl: prefix + "/add", @@ -195,7 +212,7 @@ return $.table.selectDictLabel(useStatusDatas, value); } }, - {title: '工程员',field: 'createBy'}, + {title: '工程员',field: 'businessMembers'}, {title: 'bom号',field: 'bomNo',}, {title: '关联料号',field: 'materialNo'}, { diff --git a/ruoyi-admin/src/main/resources/templates/erp/bom/detail.html b/ruoyi-admin/src/main/resources/templates/erp/bom/detail.html index ecda63aa..bb0bf1ad 100644 --- a/ruoyi-admin/src/main/resources/templates/erp/bom/detail.html +++ b/ruoyi-admin/src/main/resources/templates/erp/bom/detail.html @@ -64,6 +64,14 @@ +
    + +
    + +
    +
    @@ -110,7 +118,22 @@ } } - $(function() { + $(function() { + $.ajax({ + url: ctx + 'erp/material/getEngineerList', + type: 'get', + success: function (res) { + if (res.rows.length > 0) { + var usertData = res.rows; + for (let i in usertData) { + $("select[name='businessMembers']").append( + ""); + } + } else { + $.modal.msgError(res.msg); + } + } + }); $("#selectMaterialType").val(materilaType1); var options = { url: prefix + "/oneLevelList", 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 cab30182..a1bae484 100644 --- a/ruoyi-admin/src/main/resources/templates/erp/bom/edit.html +++ b/ruoyi-admin/src/main/resources/templates/erp/bom/edit.html @@ -65,6 +65,14 @@
    +
    + +
    + +
    +
    @@ -126,7 +134,22 @@ } } - $(function() { + $(function() { + $.ajax({ + url: ctx + 'erp/material/getEngineerList', + type: 'get', + success: function (res) { + if (res.rows.length > 0) { + var usertData = res.rows; + for (let i in usertData) { + $("select[name='businessMembers']").append( + ""); + } + } else { + $.modal.msgError(res.msg); + } + } + }); $("#selectMaterialType").val(materialType1); var options = { url: prefix + "/oneLevelList",