From 2cfe2069bc11425408dda760f8c8a4ace3d890b7 Mon Sep 17 00:00:00 2001
From: rdpnr_hemingxia <rdpnr_he.mingxia@unisinsight.com>
Date: Wed, 23 Apr 2025 11:55:11 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=B4=E4=BF=9D=E6=9F=A5=E8=AF=A2=E6=9C=AA?=
 =?UTF-8?q?=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/manage/delivery/add.html        | 39 ++++++++-----
 .../templates/manage/delivery/edit.html       | 30 +++++++---
 .../templates/manage/delivery/import.html     |  4 ++
 .../manage/delivery/selectOrder.html          | 56 +++++++++++++++++++
 .../templates/manage/service/service.html     | 45 +++++++++++++++
 ruoyi-sip/pom.xml                             |  4 ++
 6 files changed, 156 insertions(+), 22 deletions(-)
 create mode 100644 ruoyi-admin/src/main/resources/templates/manage/delivery/selectOrder.html
 create mode 100644 ruoyi-admin/src/main/resources/templates/manage/service/service.html

diff --git a/ruoyi-admin/src/main/resources/templates/manage/delivery/add.html b/ruoyi-admin/src/main/resources/templates/manage/delivery/add.html
index af868835..35918807 100644
--- a/ruoyi-admin/src/main/resources/templates/manage/delivery/add.html
+++ b/ruoyi-admin/src/main/resources/templates/manage/delivery/add.html
@@ -11,9 +11,9 @@
                 <div class="form-group">
                     <label class="col-sm-4 control-label is-required">关联合同：</label>
                     <div class="col-sm-8">
-                        <select name="orderId" class="form-control" required>
+                        <input style="display: none" name="orderId" class="form-control" readonly type="text"  required>
+                        <input name="orderName" class="form-control" readonly type="text" onclick="openList()" required>
 
-                        </select>
                     </div>
                 </div>
             </div>
@@ -128,20 +128,19 @@
             focusCleanup: true
         });
         $(function (){
-            getOrderList()
 
         })
-function getOrderList() {
-    $.operate.post(prefixOrder + "/list",{isTable:0}, function (res){
-        orderList=res.rows
-        $("[name='orderId']").html(
-            orderList.map((ele)=>{
-                return `<option value="${ele.id}">${ele.orderName}</option>`
-            }).join('')
-        )
-
-    })
-}
+// function getOrderList() {
+//     $.operate.post(prefixOrder + "/list",{isTable:0}, function (res){
+//         orderList=res.rows
+//         $("[name='orderId']").html(
+//             orderList.map((ele)=>{
+//                 return `<option value="${ele.id}">${ele.orderName}</option>`
+//             }).join('')
+//         )
+//
+//     })
+// }
         function submitHandler() {
             if ($.validate.form()) {
                 $.operate.save(prefix + "/add", $('#form-delivery-add').serialize());
@@ -159,6 +158,18 @@ function getOrderList() {
             minView: "month",
             autoclose: true
         });
+        function openList(id){
+            var options = {
+                title: "关联合同",
+                url: prefix + '/selectOrder',
+                skin: 'layui-layer-gray',
+                btn: false,
+                maxmin: false,
+                full: false,
+                index:1000
+            };
+            $.modal.openOptions(options)
+        }
     </script>
 </body>
 </html>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/manage/delivery/edit.html b/ruoyi-admin/src/main/resources/templates/manage/delivery/edit.html
index 2e85eaa4..ed4b1579 100644
--- a/ruoyi-admin/src/main/resources/templates/manage/delivery/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/manage/delivery/edit.html
@@ -12,9 +12,9 @@
                 <div class="form-group">
                     <label class="col-sm-4 control-label is-required">关联合同：</label>
                     <div class="col-sm-8">
-                        <select name="orderId" class="form-control" th:orderId="*{orderId}" required>
+                        <input style="display: none" th:orderId="*{orderId}" name="orderId" class="form-control" readonly type="text" required>
+                        <input name="orderName" th:orderName="*{orderName}" class="form-control" readonly type="text" onclick="openList()" required>
 
-                        </select>
                     </div>
                 </div>
             </div>
@@ -128,17 +128,19 @@
             focusCleanup: true
         });
         $(function (){
-            getOrderList()
+            setTimeout( getOrderList(),500)
+
         })
         function getOrderList() {
             $.operate.post(prefixOrder + "/list",{isTable:0}, function (res){
                 orderList=res.rows
                 var orderId=$("[name='orderId']").attr('orderid')
-                $("[name='orderId']").html(
-                    orderList.map((ele)=>{
-                        return `<option value="${ele.id}" ${orderId==ele.id?'selected':''}>${ele.orderName}</option>`
-                    }).join('')
-                )
+                orderList.forEach((ele)=>{
+                    if(ele.id==orderId){
+                        $("[name='orderName']").val(ele.orderName)
+                        $("[name='orderId']").val(ele.id)
+                    }
+                })
 
             })
         }
@@ -159,6 +161,18 @@
             minView: "month",
             autoclose: true
         });
+        function openList(){
+            var options = {
+                title: "关联合同",
+                url: prefix + '/selectOrder',
+                skin: 'layui-layer-gray',
+                btn: false,
+                maxmin: false,
+                full: false,
+                index:1000
+            };
+            $.modal.openOptions(options)
+        }
     </script>
 </body>
 </html>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/manage/delivery/import.html b/ruoyi-admin/src/main/resources/templates/manage/delivery/import.html
index ca9c0425..859335b4 100644
--- a/ruoyi-admin/src/main/resources/templates/manage/delivery/import.html
+++ b/ruoyi-admin/src/main/resources/templates/manage/delivery/import.html
@@ -63,6 +63,10 @@ url: prefix + "/list",
     field: 'productCode',
     title: '产品编码'
     },
+        {
+            field: 'model',
+            title: '产品型号'
+        },
     {
     field: 'serialNumber',
     title: '产品序列号'
diff --git a/ruoyi-admin/src/main/resources/templates/manage/delivery/selectOrder.html b/ruoyi-admin/src/main/resources/templates/manage/delivery/selectOrder.html
new file mode 100644
index 00000000..2d0fa3b8
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/templates/manage/delivery/selectOrder.html
@@ -0,0 +1,56 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<head>
+  <th:block th:include="include :: header('关联合同')" />
+</head>
+<body  class="gray-bg">
+<div class="col-sm-12 select-table table-striped"  >
+
+  <table id="bootstrap-table"></table>
+</div>
+<th:block th:include="include :: footer" />
+
+
+<script>
+  var prefixOrder = ctx + "manage/order";
+  $(function() {
+    var options = {
+      url: prefixOrder + "/list",
+      showSearch:false,
+      showColumns:false,
+      showToggle:false,
+      showPageGo:true,
+      params:{
+
+      },
+      onClickRow:function (row,event) {
+        $(parent[parent.length-2].document).find("input[name='orderId']").val(row.id)
+        $(parent[parent.length-2].document).find("input[name='orderName']").val(row.orderName)
+        $.modal.close();
+
+      },
+      columns: [{
+        checkbox: false,
+      },
+        {
+          field: 'id',
+          title: '主键',
+        },
+        {
+          field: 'orderCode',
+          title: '合同编号'
+        },
+        {
+          field: 'orderName',
+          title: '合同名称'
+        },
+      ]
+    };
+    $.table.init(options);
+  });
+
+
+</script>
+</body>
+
+</html>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/manage/service/service.html b/ruoyi-admin/src/main/resources/templates/manage/service/service.html
new file mode 100644
index 00000000..1f91d3fd
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/templates/manage/service/service.html
@@ -0,0 +1,45 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<head>
+    <th:block th:include="include :: header('关联合同')" />
+</head>
+<body  class="gray-bg">
+<div class="col-sm-12 select-table table-striped"  >
+    <h2>查询结果</h2>
+    <h4 style="margin-top: 40px;">产品信息</h4>
+    <table>
+        <tr>
+            <th>硬件序列号</th>
+            <th>产品号</th>
+            <th>产品描述</th>
+            <th>产品线描述</th>
+            <th>区域</th>
+        </tr>
+        <tr>
+            <td>2131340A.CZ02300002M</td>
+            <td>313048.C</td>
+            <td>H3C Workspace 云桌面许可证</td>
+            <td>云产品</td>
+            <td>CN</td>
+        </tr>
+    </table>
+</div>
+<th:block th:include="include :: footer" />
+
+
+<script>
+    $(function() {
+        getData()
+    });
+    function getData() {
+
+        $.operate.get("/system/product/query",{isTable:0}, function (res){
+
+        })
+    }
+
+
+</script>
+</body>
+
+</html>
\ No newline at end of file
diff --git a/ruoyi-sip/pom.xml b/ruoyi-sip/pom.xml
index 09febd07..e4c44506 100644
--- a/ruoyi-sip/pom.xml
+++ b/ruoyi-sip/pom.xml
@@ -27,5 +27,9 @@
             <groupId>com.ruoyi</groupId>
             <artifactId>ruoyi-common</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+        </dependency>
     </dependencies>
 </project>