From 9951498cd354d7881944beda2a1a1c04e35f6b3c Mon Sep 17 00:00:00 2001
From: youjianchi <13260889671@163.com>
Date: Thu, 15 Feb 2024 14:37:48 +0800
Subject: [PATCH] =?UTF-8?q?[fix]:BOM=E6=96=B0=E5=A2=9E=E4=BF=9D=E5=AD=98?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=9C=AA=E4=BF=9D=E5=AD=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/templates/erp/bom/add.html   | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

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 a87bf523..8e52d4a3 100644
--- a/ruoyi-admin/src/main/resources/templates/erp/bom/add.html
+++ b/ruoyi-admin/src/main/resources/templates/erp/bom/add.html
@@ -28,8 +28,7 @@
             <div class="form-group">    
                 <label class="col-sm-3 control-label">物料类型：</label>
                 <div class="col-sm-8">
-<!--                    <input name="materialType" class="form-control" readonly />-->
-                    <select disabled id="selectMaterialType" class="form-control m-b select2-multiple" th:with="childList=${@category.getChildByCode('materialType')}" readonly>
+                    <select disabled id="selectMaterialType" name="materialType" class="form-control m-b select2-multiple" th:with="childList=${@category.getChildByCode('materialType')}">
                         <optgroup>
                            <option value=""></option>
                         </optgroup>
@@ -38,13 +37,11 @@
                         </optgroup>
                     </select>
                 </div>
-                <input type="text" readonly id="materialType" name="materialType" hidden />
             </div>
             <div class="form-group">    
                 <label class="col-sm-3 control-label">加工方式：</label>
                 <div class="col-sm-8">
-<!--                    <input name="processMethod" class="form-control" type="text" readonly/>-->
-                    <select disabled id="selectProcessMethod" name="processMethod"  class="form-control m-b"  th:with="type=${@dict.getType('processMethod')}" readonly>
+                    <select disabled id="selectProcessMethod" name="processMethod"  class="form-control m-b"  th:with="type=${@dict.getType('processMethod')}">
                         <option value="" ></option>
                         <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
                     </select>
@@ -53,8 +50,7 @@
             <div class="form-group">    
                 <label class="col-sm-3 control-label">单位：</label>
                 <div class="col-sm-8">
-<!--                    <input name="unit" class="form-control" type="text" readonly/>-->
-                    <select disabled id="selectUnit" name="unit" class="form-control m-b" th:with="type=${@dict.getType('sys_unit_class')}" readonly>
+                    <select disabled id="selectUnit" name="unit" class="form-control m-b" th:with="type=${@dict.getType('sys_unit_class')}">
                        <option value=""></option>
                         <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
                     </select>
@@ -166,6 +162,7 @@
                 }
             });
             $('#materialNo').on('select2:select', function (e) {
+                debugger
                 var data = e.params.data;
                 $("input[name='materialName']").val(data.materialName);
                 $("input[name='brand']").val(data.brand);
@@ -342,12 +339,18 @@
         };*/
         function submitHandler() {
             if ($.validate.form()) {
+                $("#selectMaterialType").removeAttr("disabled");
+                $("#selectProcessMethod").removeAttr("disabled");
+                $("#selectUnit").removeAttr("disabled");
                 var formData = $("#form-bom-add").serializeArray();
                 console.log("formData",formData);
                 var tableData = $("#bootstrap-sub-table-1").bootstrapTable('getData');
                 console.log("tableData",JSON.stringify(tableData))
                 var rows = tableData.length;
                 if(rows==0){
+                    $("#selectMaterialType").attr("disabled","disabled");
+                    $("#selectProcessMethod").attr("disabled","disabled");
+                    $("#selectUnit").attr("disabled","disabled");
                     $.modal.alertWarning("子表数据不能为空！");
                 }else{
                     formData.push({"name": "erpBomList", "value": tableData});