From 69b8d1d8ab4b380e1cee433014880bdaaaabc9dc Mon Sep 17 00:00:00 2001
From: rdpnr_hemingxia <rdpnr_he.mingxia@unisinsight.com>
Date: Fri, 11 Apr 2025 16:35:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=BC=B9=E6=A1=86=E5=88=9D?=
 =?UTF-8?q?=E6=AD=A5=E7=BC=96=E5=86=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/manage/delivery/delivery.html   |  6 ++-
 .../templates/manage/delivery/import.html     | 49 +++++++++++++++++--
 2 files changed, 49 insertions(+), 6 deletions(-)
diff --git a/ruoyi-admin/src/main/resources/templates/manage/delivery/delivery.html b/ruoyi-admin/src/main/resources/templates/manage/delivery/delivery.html
index 7052ba81..0305f3e3 100644
--- a/ruoyi-admin/src/main/resources/templates/manage/delivery/delivery.html
+++ b/ruoyi-admin/src/main/resources/templates/manage/delivery/delivery.html
@@ -84,7 +84,6 @@
                 updateUrl: prefix + "/edit/{id}",
                 removeUrl: prefix + "/remove",
                 exportUrl: prefix + "/export",
-                importUrl: prefix + "/import",
                 modalName: "发货记录",
                 columns: [{
                     checkbox: true
@@ -125,7 +124,7 @@
                     align: 'center',
                     formatter: function(value, row, index) {
                         var actions = [];
-                        actions.push('<a class="btn btn-success btn-xs ' + listFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-list"></i>发货清单</a> ');
+                        actions.push('<a class="btn btn-success btn-xs ' + listFlag + '" href="javascript:void(0)" onclick="openList(\'' + row.id + '\')"><i class="fa fa-list"></i>发货清单</a> ');
                         actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
                         actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a>');
                         return actions.join('');
@@ -134,6 +133,9 @@
             };
             $.table.init(options);
         });
+        function openList(id){
+            $.modal.open('发货清单', prefix + `/import/${id}`)
+        }
     </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 566549bd..46ca9def 100644
--- a/ruoyi-admin/src/main/resources/templates/manage/delivery/import.html
+++ b/ruoyi-admin/src/main/resources/templates/manage/delivery/import.html
@@ -1,10 +1,51 @@
 <!DOCTYPE html>
-<html lang="en">
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
 <head>
-    <meta charset="UTF-8">
-    <title>Title</title>
+    <th:block th:include="include :: header('发货清单列表')" />
 </head>
 <body>
-
+<script>
+$(function() {
+var options = {
+url: prefix + "/list",
+columns: [{
+checkbox: true
+},
+{
+field: 'id',
+title: '主键，自增',
+visible: false
+},
+{
+field: 'orderId',
+title: '关联合同id'
+},
+{
+field: 'deliveryCode',
+title: '发货单号'
+},
+{
+field: 'deliveryDate',
+title: '发货日期'
+},
+{
+field: 'deliveryType',
+title: '发货方式',
+formatter: function(value, row, index) {
+return $.table.selectDictLabel(deliveryTypeDatas, value);
+}
+},
+{
+field: 'deliveryStatus',
+title: '发货状态',
+formatter: function(value, row, index) {
+return $.table.selectDictLabel(deliveryStatusDatas, value);
+}
+},
+]
+};
+$.table.init(options);
+});
+</script>
 </body>
 </html>
\ No newline at end of file
