From dc08bf9c7f64567c805963bd995a6816b10c3804 Mon Sep 17 00:00:00 2001
From: "mula.liu" <mula.liu@163.com>
Date: Mon, 28 Apr 2025 19:07:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E5=8F=91=E8=B4=A7?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95=E4=B8=AD=E9=80=89=E6=8B=A9=E5=85=B3=E8=81=94?=
 =?UTF-8?q?=E5=90=88=E5=90=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/templates/index.html   |  2 +-
 .../templates/manage/delivery/add.html        | 21 ++++--
 .../templates/manage/delivery/edit.html       | 17 +++--
 .../manage/delivery/selectOrder.html          | 65 +++++++++----------
 4 files changed, 57 insertions(+), 48 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/templates/index.html b/ruoyi-admin/src/main/resources/templates/index.html
index ca809825..6b9a4264 100644
--- a/ruoyi-admin/src/main/resources/templates/index.html
+++ b/ruoyi-admin/src/main/resources/templates/index.html
@@ -4,7 +4,7 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="renderer" content="webkit">
-    <title>若依系统首页</title>
+    <title>应用管理系统首页</title>
     <!-- 避免IE使用兼容模式 -->
  	<meta http-equiv="X-UA-Compatible" content="IE=edge">
     <link th:href="@{favicon.ico}" rel="shortcut icon"/>
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 2507c8c0..f5a95e37 100644
--- a/ruoyi-admin/src/main/resources/templates/manage/delivery/add.html
+++ b/ruoyi-admin/src/main/resources/templates/manage/delivery/add.html
@@ -160,21 +160,28 @@
             minView: "month",
             autoclose: true
         });
-        function openList(id){
+        function openList(){
             var options = {
-                title: "关联合同",
+                title: "选择合同",
                 url: prefix + '/selectOrder',
                 skin: 'layui-layer-gray',
-                btn: ['关闭'],
-                yes:function(index){
-                    $.modal.close(index)
-                },
                 maxmin: false,
                 full: false,
-                index:1000
+                index:1000,
+                callBack: doSubmit
             };
             $.modal.openOptions(options)
         }
+        function doSubmit(index, layero){
+            var rows = layero.find("iframe")[0].contentWindow.getSelections();
+            if (rows.length == 0) {
+                $.modal.alertWarning("请至少选择一条记录");
+                return;
+            }
+            $('[name="orderId"]').val(rows[0].id);
+            $(' [name="orderName"]').val(rows[0].orderName);
+            $.modal.close(index);
+        }
     </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 b157e6b1..79ca2e61 100644
--- a/ruoyi-admin/src/main/resources/templates/manage/delivery/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/manage/delivery/edit.html
@@ -168,16 +168,23 @@
                 title: "关联合同",
                 url: prefix + '/selectOrder',
                 skin: 'layui-layer-gray',
-                btn: ['关闭'],
-                yes:function(index){
-                    $.modal.close(index)
-                },
                 maxmin: false,
                 full: false,
-                index:1000
+                index:1000,
+                callBack: doSubmit
             };
             $.modal.openOptions(options)
         }
+        function doSubmit(index, layero){
+            var rows = layero.find("iframe")[0].contentWindow.getSelections();
+            if (rows.length == 0) {
+                $.modal.alertWarning("请至少选择一条记录");
+                return;
+            }
+            $('[name="orderId"]').val(rows[0].id);
+            $(' [name="orderName"]').val(rows[0].orderName);
+            $.modal.close(index);
+        }
     </script>
 </body>
 </html>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/manage/delivery/selectOrder.html b/ruoyi-admin/src/main/resources/templates/manage/delivery/selectOrder.html
index f8de6709..b177a06e 100644
--- a/ruoyi-admin/src/main/resources/templates/manage/delivery/selectOrder.html
+++ b/ruoyi-admin/src/main/resources/templates/manage/delivery/selectOrder.html
@@ -4,34 +4,31 @@
   <th:block th:include="include :: header('关联合同')" />
 </head>
 <body  class="gray-bg">
-<div class="col-sm-12 select-table table-striped"  >
-<div>
-  <form id="formId">
-    <div class="select-list">
-      <ul>
-        <li>
-          <label>合同编号：</label>
-          <input type="text" name="orderCode"/>
-        </li>
-        <li>
-          <label>合同名称：</label>
-          <input type="text" name="orderName"/>
-        </li>
-        <li>
-          <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
-          <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
-        </li>
-      </ul>
-    </div>
-  </form>
-
+<div class="container-div">
+  <div class="col-sm-12 select-table table-striped">
+    <form id="formId">
+      <div class="select-list">
+        <ul>
+          <li>
+            <label>合同编号：</label>
+            <input type="text" name="orderCode"/>
+          </li>
+          <li>
+            <label>合同名称：</label>
+            <input type="text" name="orderName"/>
+          </li>
+          <li>
+            <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
+            <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+          </li>
+        </ul>
+      </div>
+    </form>
+    <table id="bootstrap-table"></table>
+  </div>
 </div>
-  <table id="bootstrap-table"></table>
-</div>
-
 <th:block th:include="include :: footer" />
 
-
 <script>
   var prefixOrder = ctx + "manage/order";
   $(function() {
@@ -41,20 +38,14 @@
       showColumns:false,
       showToggle:false,
       showRefresh:false,
-
+      pageSize:8,
       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,
-      },
+        columns: [{
+          radio: true
+        },
         {
           field: 'id',
           title: '主键',
@@ -72,6 +63,10 @@
     $.table.init(options);
   });
 
+  function getSelections() {
+    var rows = $('#bootstrap-table').bootstrapTable('getSelections');
+    return rows;
+  }
 
 </script>
 </body>