From d06d325a480bb22d6d11cd38901aba902c06d210 Mon Sep 17 00:00:00 2001
From: zhangsiqi <2825463979@qq.com>
Date: Sat, 20 Apr 2024 15:33:17 +0800
Subject: [PATCH] =?UTF-8?q?[update]bom=E7=89=A9=E6=96=99=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=B7=A5=E7=A8=8B=E5=91=98=E6=9F=A5=E8=AF=A2=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/templates/erp/bom/bom.html | 25 ++++++++++++++++---
 .../resources/templates/erp/bom/detail.html   | 25 ++++++++++++++++++-
 .../resources/templates/erp/bom/edit.html     | 25 ++++++++++++++++++-
 3 files changed, 69 insertions(+), 6 deletions(-)

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 @@
                             </li>
                             <li>
                                 <label>物料类型：</label>
-                                <select readonly id="selectMaterialType" name="materialType" class="form-control m-b select2-multiple" th:with="childList=${@category.getChildByCode('materialType')}" required>
+                                <select readonly id="selectMaterialType" name="materialType"  th:with="childList=${@category.getChildByCode('materialType')}" required>
                                     <optgroup>
                                         <option value=""></option>
                                     </optgroup>
@@ -32,7 +32,6 @@
                                         <option th:each="childSon: ${child.children}" th:value="${childSon.code}" th:text="${#strings.concat(child.name,'-',childSon.name)}"></option>
                                     </optgroup>
                                 </select>
-                                <input type="text" id="materialType" name="materialType" hidden />
                             </li>
                             <li>
                                 <label>审核状态：</label>
@@ -48,9 +47,12 @@
                                     <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
                                 </select>
                             </li>
+
                             <li>
                                 <label>工程员：</label>
-                                <input type="text" id="createBy" name="createBy"/>
+                                <select id="businessMembers" name="businessMembers" >
+                                    <option value="">所有</option>
+                                </select>
                             </li>
                             <li class="select-time">
                                 <label>录入时间：</label>
@@ -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(
+                                "<option value='" + usertData[i].userName + "'>" + usertData[i].userName + "</option>");
+                        }
+                    } 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 @@
                     <textarea  name="describe" class="form-control" readonly>[[*{describe}]]</textarea>
                 </div>
             </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">工程员：</label>
+                <div class="col-sm-8">
+                    <select name="businessMembers" class="form-control">
+                        <option value="">请选择</option>
+                    </select>
+                </div>
+            </div>
         </form>
         <div class="btn-group-sm" id="toolbar" role="group">
             <a class="btn btn-success" onclick="insertRow()" disabled>
@@ -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(
+                                "<option value='" + usertData[i].userName + "'>" + usertData[i].userName + "</option>");
+                        }
+                    } 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 @@
                     <textarea  name="describe" class="form-control" readonly>[[*{describe}]]</textarea>
                 </div>
             </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label">工程员：</label>
+                <div class="col-sm-8">
+                    <select name="businessMembers" class="form-control">
+                        <option value="">请选择</option>
+                    </select>
+                </div>
+            </div>
         </form>
         <div class="btn-group-sm" id="toolbar" role="group">
             <a class="btn btn-success" onclick="insertRow()">
@@ -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(
+                                "<option value='" + usertData[i].userName + "'>" + usertData[i].userName + "</option>");
+                        }
+                    } else {
+                        $.modal.msgError(res.msg);
+                    }
+                }
+            });
             $("#selectMaterialType").val(materialType1);
             var options = {
                 url: prefix + "/oneLevelList",