Merge branch 'master' into 测试

src/components/process/order.vue

@@ -1095,12 +1095,10 @@ const saveShippingPackage = (data) => {
 };
 const computeDeliveryMaterialsFee = () => {
   let money = 0;
-  if (formData.data.orderPackageBomList && formData.data.orderPackageBomList.length > 0) {
-    for (let i = 0; i < formData.data.orderPackageBomList.length; i++) {
-      if (formData.data.orderPackageBomList[i].internalSellingPrice && formData.data.orderPackageBomList[i].quantity) {
-        money = Number(
-          Math.round((money + formData.data.orderPackageBomList[i].internalSellingPrice * formData.data.orderPackageBomList[i].quantity) * 100) / 100
-        );
+  if (formData.data.orderSkuList && formData.data.orderSkuList.length > 0) {
+    for (let i = 0; i < formData.data.orderSkuList.length; i++) {
+      if (formData.data.orderSkuList[i].deliveryMaterialsFee && formData.data.orderSkuList[i].quantity) {
+        money = Number(Math.round((money + formData.data.orderSkuList[i].deliveryMaterialsFee * formData.data.orderSkuList[i].quantity) * 100) / 100);
       }
     }
   }

src/views/group/order/after-sale/initiate.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-card class="box-card">
+  <el-card class="box-card" v-loading="loading">
     <div style="padding: 8px; text-align: center" v-if="orderDetail.code || orderDetail.wlnCode">
       <span style="font-size: 18px; font-weight: 700">{{ orderDetail.code }} </span>
       <span style="font-size: 18px; font-weight: 700" v-if="orderDetail.wlnCode"> ({{ orderDetail.wlnCode }})</span>
@@ -219,6 +219,7 @@ const clickCancel = () => {
     });
   }
 };
+const loading = ref(false);
 const submitForm = () => {
   proxy.$refs.submit.handleSubmit(() => {
     if (formData.data.orderExchangeDetailList && formData.data.orderExchangeDetailList.length > 0) {
@@ -233,10 +234,17 @@ const submitForm = () => {
       } else {
         formData.data.fileList = [];
       }
-      proxy.post("/orderExchange/add", formData.data).then(() => {
-        ElMessage({ message: "提交成功", type: "success" });
-        clickCancel();
-      });
+      loading.value = true;
+      proxy.post("/orderExchange/add", formData.data).then(
+        () => {
+          ElMessage({ message: "提交成功", type: "success" });
+          clickCancel();
+        },
+        (err) => {
+          console.log(err);
+          loading.value = false;
+        }
+      );
     } else {
       return ElMessage("请添加售后商品");
     }

src/views/group/order/management/detail.vue

@@ -1145,12 +1145,10 @@ const onPreviewFile = (file) => {
 };
 const computeDeliveryMaterialsFee = () => {
   let money = 0;
-  if (formData.data.orderPackageBomList && formData.data.orderPackageBomList.length > 0) {
-    for (let i = 0; i < formData.data.orderPackageBomList.length; i++) {
-      if (formData.data.orderPackageBomList[i].internalSellingPrice && formData.data.orderPackageBomList[i].quantity) {
-        money = Number(
-          Math.round((money + formData.data.orderPackageBomList[i].internalSellingPrice * formData.data.orderPackageBomList[i].quantity) * 100) / 100
-        );
+  if (formData.data.orderSkuList && formData.data.orderSkuList.length > 0) {
+    for (let i = 0; i < formData.data.orderSkuList.length; i++) {
+      if (formData.data.orderSkuList[i].deliveryMaterialsFee && formData.data.orderSkuList[i].quantity) {
+        money = Number(Math.round((money + formData.data.orderSkuList[i].deliveryMaterialsFee * formData.data.orderSkuList[i].quantity) * 100) / 100);
       }
     }
   }

src/views/group/order/management/index.vue

@@ -514,7 +514,7 @@ const config = computed(() => {
                 },
               }
             : {},
-          !props.selectStatus && row.status == 60
+          !props.selectStatus && row.status == 18
             ? {
                 attrs: {
                   label: "取消挂起",

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

@@ -1461,12 +1461,10 @@ const getShippingPackage = () => {
 };
 const computeDeliveryMaterialsFee = () => {
   let money = 0;
-  if (formData.data.orderPackageBomList && formData.data.orderPackageBomList.length > 0) {
-    for (let i = 0; i < formData.data.orderPackageBomList.length; i++) {
-      if (formData.data.orderPackageBomList[i].internalSellingPrice && formData.data.orderPackageBomList[i].quantity) {
-        money = Number(
-          Math.round((money + formData.data.orderPackageBomList[i].internalSellingPrice * formData.data.orderPackageBomList[i].quantity) * 100) / 100
-        );
+  if (formData.data.orderSkuList && formData.data.orderSkuList.length > 0) {
+    for (let i = 0; i < formData.data.orderSkuList.length; i++) {
+      if (formData.data.orderSkuList[i].deliveryMaterialsFee && formData.data.orderSkuList[i].quantity) {
+        money = Number(Math.round((money + formData.data.orderSkuList[i].deliveryMaterialsFee * formData.data.orderSkuList[i].quantity) * 100) / 100);
       }
     }
   }

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

@@ -1039,12 +1039,10 @@ const selectExpressPacking = (data) => {
 };
 const computeDeliveryMaterialsFee = () => {
   let money = 0;
-  if (formData.data.orderPackageBomList && formData.data.orderPackageBomList.length > 0) {
-    for (let i = 0; i < formData.data.orderPackageBomList.length; i++) {
-      if (formData.data.orderPackageBomList[i].internalSellingPrice && formData.data.orderPackageBomList[i].quantity) {
-        money = Number(
-          Math.round((money + formData.data.orderPackageBomList[i].internalSellingPrice * formData.data.orderPackageBomList[i].quantity) * 100) / 100
-        );
+  if (formData.data.orderSkuList && formData.data.orderSkuList.length > 0) {
+    for (let i = 0; i < formData.data.orderSkuList.length; i++) {
+      if (formData.data.orderSkuList[i].deliveryMaterialsFee && formData.data.orderSkuList[i].quantity) {
+        money = Number(Math.round((money + formData.data.orderSkuList[i].deliveryMaterialsFee * formData.data.orderSkuList[i].quantity) * 100) / 100);
       }
     }
   }