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 ae6c6384..247e8d79 100644 --- a/ruoyi-admin/src/main/resources/templates/erp/bom/add.html +++ b/ruoyi-admin/src/main/resources/templates/erp/bom/add.html @@ -76,7 +76,9 @@
- +
@@ -318,11 +320,21 @@ }] }; $.table.init(options); - /**function optFormatter(value, row, index) { - var actions = []; - actions.push('选择 '); - return actions.join(''); - }*/ + $.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); + } + } + }); }); function materilalSelect(data) { var materialType1 = data.materialType.indexOf('yl'); @@ -338,20 +350,6 @@ $("#selectProcessMethod").val([data.processMethod]).trigger("change"); $("#selectUnit").val([data.unit]).trigger("change"); } - /** window.optEvent = { - 'click .optRow': function(e, value, row, index) { - console.log("optRow"); - console.log(row); - var url = ctx + "erp/material/select"; - var options = { - title: '选择料号', - url: url, - uniqueId: row.id, - callBack: doSubmit - }; - $.modal.openOptions(options); - }, - };*/ function submitHandler() { if ($.validate.form()) { $("#selectMaterialType").removeAttr("disabled"); diff --git a/ruoyi-admin/src/main/resources/templates/erp/bom/taskGcjlVerify.html b/ruoyi-admin/src/main/resources/templates/erp/bom/taskGcjlVerify.html index de3f7b60..e7e7910b 100644 --- a/ruoyi-admin/src/main/resources/templates/erp/bom/taskGcjlVerify.html +++ b/ruoyi-admin/src/main/resources/templates/erp/bom/taskGcjlVerify.html @@ -10,6 +10,9 @@
+ + +
@@ -86,6 +89,14 @@
+
+ +
+ +
+
@@ -235,7 +246,23 @@ }, } }) - + $(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 prefix = ctx + "erp/bom"; $("#form-edit").validate({ focusCleanup: true diff --git a/ruoyi-admin/src/main/resources/templates/erp/bom/taskGczgVerify.html b/ruoyi-admin/src/main/resources/templates/erp/bom/taskGczgVerify.html index 269f4989..d358eadb 100644 --- a/ruoyi-admin/src/main/resources/templates/erp/bom/taskGczgVerify.html +++ b/ruoyi-admin/src/main/resources/templates/erp/bom/taskGczgVerify.html @@ -10,6 +10,9 @@ + + +
@@ -94,6 +97,14 @@
+
+ +
+ +
+
@@ -245,10 +256,24 @@ }) var prefix = ctx + "erp/bom"; - $("#form-edit").validate({ - focusCleanup: true - }); - + $("#form-edit").validate({focusCleanup: true}); + $(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); + } + } + }); + }) function submitHandler() { if ($.validate.form()) { var materialType = $('#selectMaterialType').select2('val'); diff --git a/ruoyi-admin/src/main/resources/templates/erp/bom/taskModifyApply.html b/ruoyi-admin/src/main/resources/templates/erp/bom/taskModifyApply.html index f8b4f76b..2382a7d3 100644 --- a/ruoyi-admin/src/main/resources/templates/erp/bom/taskModifyApply.html +++ b/ruoyi-admin/src/main/resources/templates/erp/bom/taskModifyApply.html @@ -10,6 +10,9 @@ + + +
@@ -87,6 +90,14 @@
+
+ +
+ +
+
@@ -237,20 +248,6 @@ isInteger: true, minlength: 10, maxlength: 10, - // remote: { - // url: prefix + "/checkMaterialNoUnique", - // type: "post", - // dataType: "json", - // data: { - // "materialNo": function() { - // console.log($("#materialNo").val()) - // return $.common.trim($("#materialNo").val()); - // } - // }, - // dataFilter: function(data, type) { - // return $.validate.unique(data); - // } - // } }, }, messages: { @@ -262,7 +259,23 @@ }, focusCleanup: true }); - + $(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); + } + } + }); + }) function submitHandler() { if ($.validate.form()) { var materialType = $('#selectMaterialType').select2('val'); diff --git a/ruoyi-admin/src/main/resources/templates/erp/bom/taskYfzjVerify.html b/ruoyi-admin/src/main/resources/templates/erp/bom/taskYfzjVerify.html index c6ba75fe..b75cda3f 100644 --- a/ruoyi-admin/src/main/resources/templates/erp/bom/taskYfzjVerify.html +++ b/ruoyi-admin/src/main/resources/templates/erp/bom/taskYfzjVerify.html @@ -10,6 +10,9 @@ + + +
@@ -86,6 +89,14 @@
+
+ +
+ +
+
@@ -237,10 +248,24 @@ }) var prefix = ctx + "erp/bom"; - $("#form-edit").validate({ - focusCleanup: true - }); - + $("#form-edit").validate({focusCleanup: true}); + $(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); + } + } + }); + }) function submitHandler() { if ($.validate.form()) { var materialType = $('#selectMaterialType').select2('val');