diff --git a/ruoyi-admin/src/main/resources/templates/erp/material/add.html b/ruoyi-admin/src/main/resources/templates/erp/material/add.html index 41fa9965..f050e08e 100644 --- a/ruoyi-admin/src/main/resources/templates/erp/material/add.html +++ b/ruoyi-admin/src/main/resources/templates/erp/material/add.html @@ -69,7 +69,7 @@
-
@@ -77,7 +77,7 @@
- +
@@ -164,27 +164,10 @@ //获取工程员 $(function(){ $("#businessMembers_add").val(loginName); - $("#businessMembers_add").text(userName); - supplierName(); engineer(); $("#add-weiwai").hide(); }) - //获取供应商 - function supplierName(){ - $.ajax({ - url: ctx + 'system/supplier/getSupplier', - type: 'post', - success: function (res) { - if (res.rows.length > 0) { - var usertData = res.rows; - for (let i in usertData) { - $("#form-material-add select[name='supplierName']").append( - ""); - } - } - } - }) - } + function engineer(){ $.ajax({ url: ctx + 'erp/material/getEngineerList', @@ -194,7 +177,7 @@ var usertData = res.rows; for (let i in usertData) { $("select[name='businessMembers']").append( - ""); + ""); } } else { $.modal.msgError(res.msg); @@ -255,6 +238,10 @@ function submitHandler() { if ($.validate.form()) { + $("#selectMaterialType").removeAttr("disabled"); + $("#selectProcessMethod").removeAttr("disabled"); + $("#selectUnit").removeAttr("disabled"); + $("#selectWarehouseDept").removeAttr("disabled"); var materialType = $('#selectMaterialType').select2('val'); $('#materialType').val(materialType); $.operate.save(prefix + "/add", $('#form-material-add').serialize()); diff --git a/ruoyi-admin/src/main/resources/templates/erp/material/edit.html b/ruoyi-admin/src/main/resources/templates/erp/material/edit.html index a55aa244..f5d2cf23 100644 --- a/ruoyi-admin/src/main/resources/templates/erp/material/edit.html +++ b/ruoyi-admin/src/main/resources/templates/erp/material/edit.html @@ -35,7 +35,7 @@
-
@@ -43,7 +43,7 @@
- @@ -64,7 +64,7 @@
-
@@ -72,7 +72,7 @@
-
@@ -258,10 +258,10 @@ if (res.rows.length > 0) { var usertData = res.rows; for (let i in usertData) { - engineerSelect.append( - ""); + $("#businessMembers_edit").append( + ""); } - engineerSelect.val(erpMaterial.businessMembers); + $("#businessMembers_edit").val(erpMaterial.businessMembers); } else { $.modal.msgError(res.msg); } @@ -271,6 +271,7 @@ //获取供应商 function submitHandler() { if ($.validate.form()) { + $("#businessMembers_edit").removeAttr("disabled"); var materialType = $('#selectMaterialType').select2('val'); $('#materialType').val(materialType); $.operate.save(prefix + "/edit", $('#form-material-edit').serialize()); diff --git a/ruoyi-admin/src/main/resources/templates/erp/material/taskGcjlVerify.html b/ruoyi-admin/src/main/resources/templates/erp/material/taskGcjlVerify.html index 64c5e757..60c584c7 100644 --- a/ruoyi-admin/src/main/resources/templates/erp/material/taskGcjlVerify.html +++ b/ruoyi-admin/src/main/resources/templates/erp/material/taskGcjlVerify.html @@ -64,7 +64,7 @@
- @@ -73,7 +73,7 @@
-
@@ -93,7 +93,7 @@
-
@@ -101,7 +101,7 @@
- +
@@ -259,6 +259,10 @@ $("#form-gcjl-edit").validate({focusCleanup: true}); function submitHandler() { if ($.validate.form()) { + $("#selectMaterialType").removeAttr("disabled"); + $("#selectProcessMethod").removeAttr("disabled"); + $("#selectUnit").removeAttr("disabled"); + $("#selectWarehouseDept").removeAttr("disabled"); var materialType = $('#selectMaterialType').select2('val'); $('#materialType').val(materialType); if ($('textarea[name="comment"]').val()) { diff --git a/ruoyi-admin/src/main/resources/templates/erp/material/taskGczgVerify.html b/ruoyi-admin/src/main/resources/templates/erp/material/taskGczgVerify.html index 0dea0731..47fd80a9 100644 --- a/ruoyi-admin/src/main/resources/templates/erp/material/taskGczgVerify.html +++ b/ruoyi-admin/src/main/resources/templates/erp/material/taskGczgVerify.html @@ -64,7 +64,7 @@
- @@ -73,7 +73,7 @@
-
@@ -93,7 +93,7 @@
-
@@ -101,7 +101,7 @@
- +
@@ -258,6 +258,10 @@ $("#form-edit").validate({focusCleanup: true}); function submitHandler() { if ($.validate.form()) { + $("#selectMaterialType").removeAttr("disabled"); + $("#selectProcessMethod").removeAttr("disabled"); + $("#selectUnit").removeAttr("disabled"); + $("#selectWarehouseDept").removeAttr("disabled"); var materialType = $('#selectMaterialType').select2('val'); $('#materialType').val(materialType); if ($('textarea[name="comment"]').val()) { diff --git a/ruoyi-admin/src/main/resources/templates/erp/material/taskModifyApply.html b/ruoyi-admin/src/main/resources/templates/erp/material/taskModifyApply.html index 5a7d0773..d659c9d5 100644 --- a/ruoyi-admin/src/main/resources/templates/erp/material/taskModifyApply.html +++ b/ruoyi-admin/src/main/resources/templates/erp/material/taskModifyApply.html @@ -65,7 +65,7 @@
- @@ -74,7 +74,7 @@
-
@@ -94,7 +94,7 @@
-
@@ -102,8 +102,7 @@
- +
@@ -269,6 +268,10 @@ }); function submitHandler() { if ($.validate.form()) { + $("#selectMaterialType").removeAttr("disabled"); + $("#selectProcessMethod").removeAttr("disabled"); + $("#selectUnit").removeAttr("disabled"); + $("#selectWarehouseDept").removeAttr("disabled"); var materialType = $('#selectMaterialType').select2('val'); $('#materialType').val(materialType); var taskId = [[${taskId}]]; diff --git a/ruoyi-admin/src/main/resources/templates/erp/material/taskYfzjVerify.html b/ruoyi-admin/src/main/resources/templates/erp/material/taskYfzjVerify.html index cac99ae9..df58b3a0 100644 --- a/ruoyi-admin/src/main/resources/templates/erp/material/taskYfzjVerify.html +++ b/ruoyi-admin/src/main/resources/templates/erp/material/taskYfzjVerify.html @@ -64,7 +64,7 @@
- @@ -73,7 +73,7 @@
-
@@ -93,7 +93,7 @@
-
@@ -101,7 +101,7 @@
- +
@@ -258,6 +258,10 @@ $("#form-edit").validate({focusCleanup: true}); function submitHandler() { if ($.validate.form()) { + $("#selectMaterialType").removeAttr("disabled"); + $("#selectProcessMethod").removeAttr("disabled"); + $("#selectUnit").removeAttr("disabled"); + $("#selectWarehouseDept").removeAttr("disabled"); var materialType = $('#selectMaterialType').select2('val'); $('#materialType').val(materialType); if ($('textarea[name="comment"]').val()) {