feat：

1. 订单管理 - 发货时判断发货数量是否为空或为零
2. 销售退货单 - 不管理的情况下，退货仓库非必选

src/views/mallManagement/order/offline_order_list/index.vue

@@ -1357,7 +1357,7 @@ export default {
       this.goodsList[index].smallId = item.smallId;
       this.goodsList[index].smallName = item.smallName;
       this.goodsList[index].unit = item.unit;
-      this.goodsList[index].stockQty = item.stockNum;
+      this.goodsList[index].stockQty = item.goodsMaterialStock;
     },
 
     creatCode(data, orderId) {

src/views/mallManagement/order/order_detail/index.vue

@@ -1204,6 +1204,11 @@ export default {
 		  if (valid) {
         if(this.deliverSelection.length < 1) return this.$errorMsg('请选择一个发货信息');
 
+        for (let i = 0; i < this.deliverSelection.length; i++) {
+          const item = this.deliverSelection[i];
+          if(!item.num || item.num == 0) return this.$errorMsg('请填写发货数量-订单数量');
+        }
+
 		    orderDeliver({
 		      orderId: this.orderId,
 		      logisticsNo: this.orderForm.pickType == 'NO' ? this.orderForm.logisticsNo : '',
@@ -1225,6 +1230,7 @@ export default {
 		    }).then(() => {
 		      this.cancelForm();
 		      this.getDetail();
+          this.getDeliverList();
 		      this.$successMsg('发货成功');
 		    })
 		  }

src/views/mallManagement/order/order_list/index.vue

@@ -1240,6 +1240,11 @@ export default {
           if (this.logisticsType === 'add') {
             if(this.deliverSelection.length < 1) return this.$errorMsg('请选择一个发货信息');
 
+            for (let i = 0; i < this.deliverSelection.length; i++) {
+              const item = this.deliverSelection[i];
+              if(!item.num || item.num == 0) return this.$errorMsg('请填写发货数量-订单数量');
+            }
+
             orderDeliver({
               orderId: this.editOrderId,
               logisticsNo: this.logisticsForm.pickType == 'NO' ? this.logisticsForm.logisticsNo : '',

src/views/mallManagement/storage/index.vue

@@ -59,6 +59,7 @@ export default {
 			formType: 'add',
 			formVisible: false,
       websitList: [],
+      joinCode: JSON.parse(localStorage.getItem('greemall_user')).joinCode,
     }
   },
   computed: {
@@ -123,7 +124,7 @@ export default {
         formItemAttributes: {
           label: '仓储属性',
           prop: 'type',
-          rules: [...required]
+          rules: this.joinCode == 'NO' ? [] : [...required]
         },
       }, {
         md: 6,