diff --git a/ruoyi-admin/src/main/resources/templates/system/salesShippingInform/cancelShipping.html b/ruoyi-admin/src/main/resources/templates/system/salesShippingInform/cancelShipping.html
index 03eee16b..a971423f 100644
--- a/ruoyi-admin/src/main/resources/templates/system/salesShippingInform/cancelShipping.html
+++ b/ruoyi-admin/src/main/resources/templates/system/salesShippingInform/cancelShipping.html
@@ -6,12 +6,12 @@
 </head>
 <body class="white-bg">
 <div class="wrapper wrapper-content animated fadeInRight ibox-content">
-    <form class="form-horizontal m" id="form-cancelShipping-add">
-        <input name="outOrderCode" th:field="*{outOrderCode}" type="hidden">
+    <form class="form-horizontal" id="form-cancelShipping-edit" th:object="${sysSalesShippingInform}">
+        <input name="shippingInformId" th:field="*{shippingInformId}" type="hidden">
         <div class="form-group">
-            <label class="col-sm-3 control-label">备注：</label>
+            <label class="col-sm-3 control-label is-required">备注：</label>
             <div class="col-sm-8">
-                <textarea name="remark" class="form-control"></textarea>
+                <textarea name="remark" th:text="*{remark}" class="form-control" required></textarea>
             </div>
         </div>
     </form>
@@ -20,13 +20,13 @@
 <th:block th:include="include :: datetimepicker-js" />
 <script th:inline="javascript">
     var prefix = ctx + "system/salesShippingInform"
-    $("#form-cancelShipping-add").validate({
+    $("#form-cancelShipping-edit").validate({
         focusCleanup: true
     });
 
     function submitHandler() {
         if ($.validate.form()) {
-            $.operate.save(prefix + "/cancelShipping", $('#form-cancelShipping-add').serialize());
+            $.operate.save(prefix + "/cancelShipping", $('#form-cancelShipping-edit').serialize());
         }
     }
 
diff --git a/ruoyi-admin/src/main/resources/templates/system/salesShippingInform/salesShippingInform.html b/ruoyi-admin/src/main/resources/templates/system/salesShippingInform/salesShippingInform.html
index 01e0e980..ab16d680 100644
--- a/ruoyi-admin/src/main/resources/templates/system/salesShippingInform/salesShippingInform.html
+++ b/ruoyi-admin/src/main/resources/templates/system/salesShippingInform/salesShippingInform.html
@@ -94,6 +94,7 @@
         var cancelFlag = [[${@permission.hasPermi('system:salesShippingInform:cancel')}]];
         var restoreFlag = [[${@permission.hasPermi('system:salesShippingInform:restore')}]];
         var confirmShippingFlag = [[${@permission.hasPermi('system:salesShippingInform:confirmShipping')}]];
+        var cancelShippingFlag = [[${@permission.hasPermi('system:salesShippingInform:cancelShipping')}]];
         var customerCheckGoodsFlag = [[${@permission.hasPermi('system:salesShippingInform:customerCheckGoods')}]];
         var customerCheckGoodsDetailFlag = [[${@permission.hasPermi('system:salesShippingInform:customerCheckGoodsDetail')}]];
 
@@ -316,6 +317,7 @@
                         actions.push('<a class="btn btn-success btn-xs ' +  customerCheckGoodsDetailFlag + '" href="javascript:void(0)" onclick="customerCheckGoodsDetail(\'' + row.shippingInformId + '\')"><i class="fa fa-edit"></i>详情</a> ');
                         if(row.warehouseOutStatus == '2'){
                             actions.push('<a class="btn btn-success btn-xs ' + confirmShippingFlag + '" href="javascript:void(0)" onclick="confirmShipping(\'' + row.shippingInformId + '\')"><i class="fa fa-edit"></i>确认发货</a> ');
+                            actions.push('<a class="btn btn-success btn-xs ' + cancelShippingFlag + '" href="javascript:void(0)" onclick="cancelShipping(\'' + row.shippingInformId + '\')"><i class="fa fa-edit"></i>取消发货</a> ');
                         }
                         if(row.warehouseOutStatus == '10' || row.warehouseOutStatus == '11'){
                             actions.push('<a class="btn btn-success btn-xs ' + customerCheckGoodsFlag + '" href="javascript:void(0)" onclick="customerCheckGoods(\'' + row.shippingInformId + '\')"><i class="fa fa-edit"></i>确认验收</a> ');
@@ -338,6 +340,13 @@
             $.modal.open("确认发货",url);
         }
 
+
+        //取消发货
+        function cancelShipping(shippingInformId){
+            var url = prefix +'/cancelShipping/' + shippingInformId;
+            $.modal.open("取消发货",url);
+        }
+
         //客户验收
         function customerCheckGoods(shippingInformId){
             var url = prefix +'/customerCheckGoods/' + shippingInformId;
