From 0f550540ef39c7ca6218c4e1ac15554929193504 Mon Sep 17 00:00:00 2001
From: zhangsiqi <2825463979@qq.com>
Date: Wed, 5 Jun 2024 20:41:10 +0800
Subject: [PATCH] =?UTF-8?q?[feat]=20=E4=BF=AE=E6=94=B9=E8=AF=A5=E5=BC=80?=
 =?UTF-8?q?=E5=8F=91=E4=BF=AE=E6=94=B9=E6=B7=BB=E5=8A=A0=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=EF=BC=8C=E6=96=B0=E5=A2=9E=E6=9F=A5=E8=AF=A2=E7=94=9F=E4=BA=A7?=
 =?UTF-8?q?=E5=8D=95=E7=89=A9=E6=96=99=E6=96=B9=E6=B3=95=EF=BC=8C=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E6=9F=A5=E8=AF=A2=E7=94=9F=E4=BA=A7=E7=89=A9=E6=96=99?=
 =?UTF-8?q?bom=E4=BF=A1=E6=81=AF=E6=9F=A5=E8=AF=A2=E6=96=B9=E6=B3=95?=
 =?UTF-8?q?=EF=BC=8C=E6=96=B0=E5=A2=9E=E5=BC=80=E5=8F=91=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E5=8D=95=E5=AD=90=E8=A1=A8=E4=BF=A1=E6=81=AF=EF=BC=8C=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9Ebom=E6=9F=A5=E8=AF=A2=E7=88=B6=E7=BA=A7=E5=8F=8A?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E9=83=A8=E9=97=A8=E6=A0=B9=E6=8D=AEmaterialN?=
 =?UTF-8?q?o=E6=9F=A5=E8=AF=A2bom=E4=BF=A1=E6=81=AF=E3=80=82=E5=BC=80?=
 =?UTF-8?q?=E5=8F=91=E4=BF=AE=E6=94=B9=E5=8D=95=E8=B0=83=E6=95=B4=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E6=A0=B7=E5=BC=8F=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/templates/erp/material/add.html | 29 +++++--------------
 .../templates/erp/material/edit.html          | 15 +++++-----
 .../erp/material/taskGcjlVerify.html          | 12 +++++---
 .../erp/material/taskGczgVerify.html          | 12 +++++---
 .../erp/material/taskModifyApply.html         | 13 +++++----
 .../erp/material/taskYfzjVerify.html          | 12 +++++---
 6 files changed, 48 insertions(+), 45 deletions(-)

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 @@
             <div class="form-group">    
                 <label class="col-sm-3 control-label is-required">入库部门：</label>
                 <div class="col-sm-8">
-                    <select name="warehouseDept" class="form-control m-b" th:with="type=${@dict.getType('warehouseDept')}" required>
+                    <select id="selectWarehouseDept" name="warehouseDept" class="form-control m-b" th:with="type=${@dict.getType('warehouseDept')}" required>
                         <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
                     </select>
                 </div>
@@ -77,7 +77,7 @@
             <div class="form-group">
                 <label class="col-sm-3 control-label is-required">工程员：</label>
                 <div class="col-sm-8">
-                    <input name="businessMembers"  id="businessMembers_add" class="form-control m-b" disabled required />
+                    <input name="businessMembers"  id="businessMembers_add" class="form-control m-b" readonly required />
                 </div>
             </div>
             <div class="form-group">
@@ -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(
-                                "<option value='" + usertData[i].supplierName + "'>" + usertData[i].supplierName + "</option>");
-                        }
-                    }
-                }
-            })
-        }
+
         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(
-                                "<option value='" + usertData[i].userName + "'>" + usertData[i].userName + "</option>");
+                                "<option value='" + usertData[i].loginName + "'>" + usertData[i].userName + "</option>");
                         }
                     } 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 @@
             <div class="form-group">    
                 <label class="col-sm-3 control-label is-required">半成品类型：</label>
                 <div class="col-sm-8">
-                    <select name="processMethod" class="form-control m-b" th:field="*{processMethod}" th:with="type=${@dict.getType('processMethod')}" required>
+                    <select  name="processMethod" class="form-control m-b" th:field="*{processMethod}" th:with="type=${@dict.getType('processMethod')}" required>
                         <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" ></option>
                     </select>
                 </div>
@@ -43,7 +43,7 @@
             <div class="form-group">    
                 <label class="col-sm-3 control-label">单位：</label>
                 <div class="col-sm-8">
-                    <select name="unit" class="form-control m-b" th:with="type=${@dict.getType('sys_unit_class')}">
+                    <select  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}" th:field="*{unit}"></option>
                     </select>
@@ -64,7 +64,7 @@
             <div class="form-group">    
                 <label class="col-sm-3 control-label is-required">入库部门：</label>
                 <div class="col-sm-8">
-                    <select  name="warehouseDept" class="form-control m-b" th:field="*{warehouseDept}" th:with="type=${@dict.getType('warehouseDept')}">
+                    <select   name="warehouseDept" class="form-control m-b" th:field="*{warehouseDept}" th:with="type=${@dict.getType('warehouseDept')}">
                         <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" ></option>
                     </select>
                 </div>
@@ -72,7 +72,7 @@
             <div class="form-group">
                 <label class="col-sm-3 control-label is-required">工程员：</label>
                 <div class="col-sm-8">
-                    <select name="businessMembers" id="businessMembers_edit" class="form-control m-b" required >
+                    <select  name="businessMembers" id="businessMembers_edit" class="form-control m-b" disabled required >
                     </select>
                 </div>
             </div>
@@ -258,10 +258,10 @@
                     if (res.rows.length > 0) {
                     var usertData = res.rows;
                         for (let i in usertData) {
-                            engineerSelect.append(
-                                "<option value='" + usertData[i].userName + "'>" + usertData[i].userName + "</option>");
+                            $("#businessMembers_edit").append(
+                                "<option value='" + usertData[i].loginName + "'>" + usertData[i].userName + "</option>");
                         }
-                        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 @@
         <div class="form-group">
             <label class="col-sm-3 control-label is-required">半成品类型：</label>
             <div class="col-sm-8">
-                <select name="processMethod" class="form-control m-b" th:with="type=${@dict.getType('processMethod')}" required disabled>
+                <select id="selectProcessMethod" name="processMethod" class="form-control m-b" th:with="type=${@dict.getType('processMethod')}" required disabled>
                     <option value="">请选择</option>
                     <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{processMethod}"></option>
                 </select>
@@ -73,7 +73,7 @@
         <div class="form-group">
             <label class="col-sm-3 control-label">单位：</label>
             <div class="col-sm-8">
-                <select name="unit" class="form-control m-b" th:with="type=${@dict.getType('sys_unit_class')}" disabled>
+                <select id="selectUnit" name="unit" class="form-control m-b" th:with="type=${@dict.getType('sys_unit_class')}" disabled>
                     <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{unit}"></option>
                 </select>
             </div>
@@ -93,7 +93,7 @@
         <div class="form-group">
             <label class="col-sm-3 control-label is-required">入库部门：</label>
             <div class="col-sm-8">
-                <select  name="warehouseDept" class="form-control m-b" th:with="type=${@dict.getType('warehouseDept')}" required disabled>
+                <select  id="selectWarehouseDept" name="warehouseDept" class="form-control m-b" th:with="type=${@dict.getType('warehouseDept')}" required disabled>
                     <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{warehouseDept}"></option>
                 </select>
             </div>
@@ -101,7 +101,7 @@
         <div class="form-group">
             <label class="col-sm-3 control-label is-required">工程员：</label>
             <div class="col-sm-8">
-                <input name="businessMembers" th:field="*{businessMembers}"  id="businessMembers_edit" class="form-control m-b" required disabled>
+                <input name="businessMembers" th:field="*{businessMembers}"  id="businessMembers_edit" class="form-control m-b" required readonly>
             </div>
         </div>
         <div class="form-group">
@@ -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 @@
         <div class="form-group">
             <label class="col-sm-3 control-label is-required">半成品类型：</label>
             <div class="col-sm-8">
-                <select name="processMethod" class="form-control m-b" th:with="type=${@dict.getType('processMethod')}" required disabled>
+                <select id="selectProcessMethod" name="processMethod" class="form-control m-b" th:with="type=${@dict.getType('processMethod')}" required disabled>
                     <option value="">请选择</option>
                     <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{processMethod}"></option>
                 </select>
@@ -73,7 +73,7 @@
         <div class="form-group">
             <label class="col-sm-3 control-label">单位：</label>
             <div class="col-sm-8">
-                <select name="unit" class="form-control m-b" th:with="type=${@dict.getType('sys_unit_class')}" disabled>
+                <select id="selectUnit" name="unit" class="form-control m-b" th:with="type=${@dict.getType('sys_unit_class')}" disabled>
                     <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{unit}"></option>
                 </select>
             </div>
@@ -93,7 +93,7 @@
         <div class="form-group">
             <label class="col-sm-3 control-label is-required">入库部门：</label>
             <div class="col-sm-8">
-                <select  name="warehouseDept" class="form-control m-b" th:with="type=${@dict.getType('warehouseDept')}" disabled required>
+                <select id="selectWarehouseDept"  name="warehouseDept" class="form-control m-b" th:with="type=${@dict.getType('warehouseDept')}" disabled required>
                     <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{warehouseDept}"></option>
                 </select>
             </div>
@@ -101,7 +101,7 @@
         <div class="form-group">
             <label class="col-sm-3 control-label">工程员：</label>
             <div class="col-sm-8">
-                <input name="businessMembers" th:field="*{businessMembers}"  id="businessMembers_edit" class="form-control m-b" required disabled>
+                <input name="businessMembers" th:field="*{businessMembers}"  id="businessMembers_edit" class="form-control m-b" required readonly>
             </div>
         </div>
         <div class="form-group">
@@ -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 @@
         <div class="form-group">
             <label class="col-sm-3 control-label is-required">半成品类型：</label>
             <div class="col-sm-8">
-                <select name="processMethod" class="form-control m-b" th:with="type=${@dict.getType('processMethod')}" required>
+                <select id="selectProcessMethod" name="processMethod" class="form-control m-b" th:with="type=${@dict.getType('processMethod')}" required>
                     <option value="">请选择</option>
                     <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{processMethod}"></option>
                 </select>
@@ -74,7 +74,7 @@
         <div class="form-group">
             <label class="col-sm-3 control-label">单位：</label>
             <div class="col-sm-8">
-                <select name="unit" class="form-control m-b" th:with="type=${@dict.getType('sys_unit_class')}">
+                <select id="selectUnit" name="unit" class="form-control m-b" th:with="type=${@dict.getType('sys_unit_class')}">
                     <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{unit}"></option>
                 </select>
             </div>
@@ -94,7 +94,7 @@
         <div class="form-group">
             <label class="col-sm-3 control-label is-required">入库部门：</label>
             <div class="col-sm-8">
-                <select  name="warehouseDept" class="form-control m-b" th:with="type=${@dict.getType('warehouseDept')}" required disabled>
+                <select id="selectWarehouseDept"  name="warehouseDept" class="form-control m-b" th:with="type=${@dict.getType('warehouseDept')}" required disabled>
                     <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{warehouseDept}"></option>
                 </select>
             </div>
@@ -102,8 +102,7 @@
         <div class="form-group">
             <label class="col-sm-3 control-label is-required">工程员：</label>
             <div class="col-sm-8">
-                <select name="businessMembers" id="businessMembers_edit" class="form-control m-b" required disabled>
-                </select>
+                <input name="businessMembers" id="businessMembers_edit" class="form-control m-b" required readonly>
             </div>
         </div>
         <div class="form-group">
@@ -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 @@
         <div class="form-group">
             <label class="col-sm-3 control-label is-required">半成品类型：</label>
             <div class="col-sm-8">
-                <select name="processMethod" class="form-control m-b" th:with="type=${@dict.getType('processMethod')}" disabled required>
+                <select id="selectProcessMethod" name="processMethod" class="form-control m-b" th:with="type=${@dict.getType('processMethod')}" disabled required>
                     <option value="">请选择</option>
                     <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{processMethod}"></option>
                 </select>
@@ -73,7 +73,7 @@
         <div class="form-group">
             <label class="col-sm-3 control-label">单位：</label>
             <div class="col-sm-8">
-                <select name="unit" class="form-control m-b" th:with="type=${@dict.getType('sys_unit_class')}" disabled>
+                <select id="selectUnit" name="unit" class="form-control m-b" th:with="type=${@dict.getType('sys_unit_class')}" disabled>
                     <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{unit}"></option>
                 </select>
             </div>
@@ -93,7 +93,7 @@
         <div class="form-group">
             <label class="col-sm-3 control-label is-required">入库部门：</label>
             <div class="col-sm-8">
-                <select  name="warehouseDept" class="form-control m-b" th:with="type=${@dict.getType('warehouseDept')}" disabled required>
+                <select  id="selectWarehouseDept" name="warehouseDept" class="form-control m-b" th:with="type=${@dict.getType('warehouseDept')}" disabled required>
                     <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{warehouseDept}"></option>
                 </select>
             </div>
@@ -101,7 +101,7 @@
         <div class="form-group">
             <label class="col-sm-3 control-label is-required">工程员：</label>
             <div class="col-sm-8">
-                <input name="businessMembers" th:field="*{businessMembers}"  id="businessMembers_edit" class="form-control m-b" required disabled>
+                <input name="businessMembers" th:field="*{businessMembers}"  id="businessMembers_edit" class="form-control m-b" required readonly>
             </div>
         </div>
         <div class="form-group">
@@ -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()) {