diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java
index 12a60f74d..8a6ce8d6b 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java
@@ -4834,6 +4834,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
             oneMap.put("deliveryaddress", jsonMst.getString("deliveryaddress")); // 送货方地址
             oneMap.put("deliveryname", jsonMst.getString("deliveryname")); // 送货方联系人
             oneMap.put("deliveryphone", jsonMst.getString("deliveryphone")); // 送货方联系电话
+            oneMap.put("contractno", jsonMst.getString("contractno")); // 合同号
         } else {
 
             if (ObjectUtil.isEmpty(jsonCust)) throw new BadRequestException("客户不存在");
@@ -4888,6 +4889,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
             oneMap.put("deliveryaddress", jsonMst.getString("deliveryaddress")); // 送货方地址
             oneMap.put("deliveryname", jsonMst.getString("deliveryname")); // 送货方联系人
             oneMap.put("deliveryphone", jsonMst.getString("deliveryphone")); // 送货方联系电话
+            oneMap.put("contractno", jsonMst.getString("contractno")); // 合同号
         }
 
         // 6.多组填充
diff --git a/lms/nladmin-ui/src/views/wms/st/outbill/index.vue b/lms/nladmin-ui/src/views/wms/st/outbill/index.vue
index a1da2591c..8846a5b60 100644
--- a/lms/nladmin-ui/src/views/wms/st/outbill/index.vue
+++ b/lms/nladmin-ui/src/views/wms/st/outbill/index.vue
@@ -413,7 +413,7 @@ export default {
         } else {
           this.confirm_flag = true
         }
-        if (current.bill_status === '40') {
+        if (current.bill_status === '40' || current.bill_status === '30') {
           this.outReturn_flag = false
         } else {
           this.outReturn_flag = true