From ff523028ae9ed3eb903118003c5ecee3ffc961a7 Mon Sep 17 00:00:00 2001
From: rdpnr_hemingxia <rdpnr_he.mingxia@unisinsight.com>
Date: Fri, 11 Apr 2025 16:06:19 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E8=B4=A7=E8=AE=B0=E5=BD=95=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                       |  2 +-
 .../main/resources/static/ruoyi/js/ry-ui.js   |  4 ++++
 .../templates/manage/delivery/add.html        | 20 ++++++++++++++++++-
 .../templates/manage/delivery/delivery.html   |  3 +++
 .../templates/manage/delivery/edit.html       | 19 +++++++++++++++++-
 .../templates/manage/delivery/import.html     | 10 ++++++++++
 .../resources/templates/manage/order/add.html | 12 +++++------
 7 files changed, 61 insertions(+), 9 deletions(-)
 create mode 100644 ruoyi-admin/src/main/resources/templates/manage/delivery/import.html

diff --git a/pom.xml b/pom.xml
index c3c58e56..c5660d6b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
     <name>ruoyi</name>
     <url>http://sip.unissens.tech</url>
     <description>汇智SIP管理系统</description>
-    
+
     <properties>
         <ruoyi.version>4.8.0</ruoyi.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js b/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js
index 0784ff31..6af8ab82 100644
--- a/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js
+++ b/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js
@@ -1056,6 +1056,10 @@ var table = {
                         if (typeof callback == "function") {
                             callback(result);
                         }
+                        if(data.isTable===0){
+                            $.modal.closeLoading();
+                            return
+                        }
                         $.operate.ajaxSuccess(result);
                     }
                 };
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 7efc5f73..b9ad89aa 100644
--- a/ruoyi-admin/src/main/resources/templates/manage/delivery/add.html
+++ b/ruoyi-admin/src/main/resources/templates/manage/delivery/add.html
@@ -11,7 +11,9 @@
                 <div class="form-group">
                     <label class="col-sm-4 control-label is-required">关联合同id：</label>
                     <div class="col-sm-8">
-                        <input name="orderId" class="form-control" type="text" required>
+                        <select name="orderId" class="form-control" required>
+
+                        </select>
                     </div>
                 </div>
             </div>
@@ -120,10 +122,26 @@
     <th:block th:include="include :: datetimepicker-js" />
     <script th:inline="javascript">
         var prefix = ctx + "manage/delivery"
+        var prefixOrder = ctx + "manage/order";
+        let orderList=[]
         $("#form-delivery-add").validate({
             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 submitHandler() {
             if ($.validate.form()) {
                 $.operate.save(prefix + "/add", $('#form-delivery-add').serialize());
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 1e2c67f0..7052ba81 100644
--- a/ruoyi-admin/src/main/resources/templates/manage/delivery/delivery.html
+++ b/ruoyi-admin/src/main/resources/templates/manage/delivery/delivery.html
@@ -70,6 +70,7 @@
     </div>
     <th:block th:include="include :: footer" />
     <script th:inline="javascript">
+        var listFlag = [[${@permission.hasPermi('manage:delivery:list')}]];
         var editFlag = [[${@permission.hasPermi('manage:delivery:edit')}]];
         var removeFlag = [[${@permission.hasPermi('manage:delivery:remove')}]];
         var deliveryTypeDatas = [[${@dict.getType('delivery_type')}]];
@@ -83,6 +84,7 @@
                 updateUrl: prefix + "/edit/{id}",
                 removeUrl: prefix + "/remove",
                 exportUrl: prefix + "/export",
+                importUrl: prefix + "/import",
                 modalName: "发货记录",
                 columns: [{
                     checkbox: true
@@ -123,6 +125,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 ' + 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('');
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 72341514..20c841d5 100644
--- a/ruoyi-admin/src/main/resources/templates/manage/delivery/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/manage/delivery/edit.html
@@ -12,7 +12,9 @@
                 <div class="form-group">
                     <label class="col-sm-4 control-label is-required">关联合同id：</label>
                     <div class="col-sm-8">
-                        <input name="orderId" th:field="*{orderId}" class="form-control" type="text" required>
+                        <select name="orderId" class="form-control" th:orderId="*{orderId}" required>
+
+                        </select>
                     </div>
                 </div>
             </div>
@@ -121,10 +123,25 @@
     <th:block th:include="include :: datetimepicker-js" />
     <script th:inline="javascript">
         var prefix = ctx + "manage/delivery";
+        var prefixOrder = ctx + "manage/order";
         $("#form-delivery-edit").validate({
             focusCleanup: true
         });
+        $(function (){
+            getOrderList()
+        })
+        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('')
+                )
 
+            })
+        }
         function submitHandler() {
             if ($.validate.form()) {
                 $.operate.save(prefix + "/edit", $('#form-delivery-edit').serialize());
diff --git a/ruoyi-admin/src/main/resources/templates/manage/delivery/import.html b/ruoyi-admin/src/main/resources/templates/manage/delivery/import.html
new file mode 100644
index 00000000..566549bd
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/templates/manage/delivery/import.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>Title</title>
+</head>
+<body>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/manage/order/add.html b/ruoyi-admin/src/main/resources/templates/manage/order/add.html
index 7cb986b4..aab33392 100644
--- a/ruoyi-admin/src/main/resources/templates/manage/order/add.html
+++ b/ruoyi-admin/src/main/resources/templates/manage/order/add.html
@@ -28,7 +28,7 @@
                 <div class="form-group">
                     <label class="col-sm-4 control-label is-required">版本号：</label>
                     <div class="col-sm-8">
-                        <input name="versionCode" class="form-control" type="text" required>
+                        <input name="versionCode" class="form-control" type="number" required>
                     </div>
                 </div>
             </div>
@@ -111,8 +111,8 @@
             </div>
             <div class="col-xs-12">
                 <div class="form-group">
-                    <label class="col-sm-4 control-label">备注：</label>
-                    <div class="col-sm-8">
+                    <label class="col-sm-2 control-label">备注：</label>
+                    <div class="col-sm-10">
                         <textarea name="remark" class="form-control"></textarea>
                     </div>
                 </div>
@@ -183,7 +183,7 @@
                     align: 'center',
                     title: '数量',
                     formatter: function(value, row, index) {
-                        var html = $.common.sprintf("<input class='form-control' type='text' name='orderListList[%s].quantity' value='%s'>", index, value);
+                        var html = $.common.sprintf("<input class='form-control' type='number' name='orderListList[%s].quantity' value='%s'>", index, value);
                         return html;
                     }
                 },
@@ -192,7 +192,7 @@
                     align: 'center',
                     title: '单价',
                     formatter: function(value, row, index) {
-                        var html = $.common.sprintf("<input class='form-control' type='text' name='orderListList[%s].price' value='%s'>", index, value);
+                        var html = $.common.sprintf("<input class='form-control' type='number' name='orderListList[%s].price' value='%s'>", index, value);
                         return html;
                     }
                 },
@@ -201,7 +201,7 @@
                     align: 'center',
                     title: '总价',
                     formatter: function(value, row, index) {
-                        var html = $.common.sprintf("<input class='form-control' type='text' name='orderListList[%s].amount' value='%s'>", index, value);
+                        var html = $.common.sprintf("<input class='form-control' type='number' name='orderListList[%s].amount' value='%s'>", index, value);
                         return html;
                     }
                 },