Merge branch '外箱包装功能修改' into 测试

src/views/subsidiary/order/management/add.vue

@@ -1278,17 +1278,25 @@ const clickSaveShippingPackage = () => {
         formData.data.deliveryMaterialsFee = computeDeliveryMaterialsFee();
         formData.data.totalAmount = calculatedTotalAmount();
         let type = "add";
-        if (formData.data.id) {
-          type = "edit";
-        }
-        proxy.post("/orderInfo/" + type, formData.data).then(() => {
-          ElMessage({
-            message: type == "add" ? "添加成功" : "编辑成功",
-            type: "success",
+        if (formData.data.id && status == "20") {
+          proxy.post("/orderInfo/confirmation", formData.data).then(() => {
+            ElMessage({ message: "提交成功", type: "success" });
+            refreshStore().setRefresh("order");
+            clickCancel();
           });
-          refreshStore().setRefresh("order");
-          clickCancel();
-        });
+        } else {
+          if (formData.data.id) {
+            type = "edit";
+          }
+          proxy.post("/orderInfo/" + type, formData.data).then(() => {
+            ElMessage({
+              message: type == "add" ? "添加成功" : "编辑成功",
+              type: "success",
+            });
+            refreshStore().setRefresh("order");
+            clickCancel();
+          });
+        }
       } else {
         ElMessageBox.confirm("是否确认无产品发货包装", "提示", {
           confirmButtonText: "确定",