Merge branch 'release' of...

Merge branch 'release' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into release2.2

 Conflicts:
	src/components/ImageAndVideoUpload/index.vue
	src/views/ecw/order/warehousing/index.vue

src/api/ecw/order.js

@@ -515,6 +515,19 @@ export function warehousePictureList(data){
     data
   })
 }
+export function warehousePictureCreate(data){
+  return request({
+    url: '/order/warehouse-picture/create',
+    method: 'post',
+    data
+  })
+}
+export function warehousePictureDelete(id){
+  return request({
+    url: '/order/warehouse-picture/delete?id=' + id,
+    method: 'delete'
+  })
+}
 
 // 获得部门订单分页
 export function deptOrderPage(params){

src/views/ecw/box/shippingSea/nodePage/cabinet/supplementOrder.vue

@@ -359,7 +359,7 @@ export default {
             if (res.code === 566) {
               this.$confirm(res.msg+this.$t('是否需要一起预装?'), this.$t("提示"), {
                 dangerouslyUseHTMLString: true,
-                type: "warning",
+                distinguishCancelAndClose: true,
                 confirmButtonText: '预装关联单',
                 cancelButtonText: '仅当前订单'
               })
@@ -371,11 +371,13 @@ export default {
                   });
                 })
                 .catch((_) => {
+                  if(action =='cancel'){
                     createGoods({ ...params, relationStatus: 2, singleLoad: true }).then((res) => {
                       serviceMsg(res, this).then(() => {
                         this.queryAllData();
                       });
                     });
+                  }
                 });
             }
           });

src/views/ecw/box/shippingSea/nodePage/preinstall.vue

@@ -713,7 +713,7 @@ export default {
             if (res.code === 566) {
               this.$confirm(res.msg+this.$t('是否需要一起预装?'), this.$t("提示"), {
                 dangerouslyUseHTMLString: true,
-                type: "warning",
+                distinguishCancelAndClose: true,
                 confirmButtonText: '预装关联单',
                 cancelButtonText: '仅当前订单'
               })
@@ -725,11 +725,13 @@ export default {
                   });
                 })
                 .catch((_) => {
+                  if(action =='cancel'){
                     createGoods({ ...params, relationStatus: 2, singleLoad: true }).then((res) => {
                       serviceMsg(res, this).then(() => {
                         this.queryAllData();
                       });
                     });
+                  }
                 });
             }
           });