外箱包装费--

src/components/process/order.vue

@@ -337,7 +337,6 @@
             <span style="font-weight: 700; color: #6c88f1; margin-left: 40px">包装人工费: ¥{{ moneyFormat(calculatedAmount("packingLabor"), 2) }}</span>
             <span style="font-weight: 700; color: #6c88f1; margin-left: 40px">包材费: ¥{{ moneyFormat(calculatedPackagingMaterialCost(), 2) }}</span>
             <span style="font-weight: 700; color: #6c88f1; margin-left: 40px">管理费: ¥{{ moneyFormat(calculatedAmount("managementFee"), 2) }}</span>
-            <span style="font-weight: 700; color: #6c88f1; margin-left: 40px">外箱包装费: ¥{{ moneyFormat(calculatedOuterBoxPackingFee(), 2) }}</span>
           </div>
           <div style="padding: 8px 0 0 0">
             <span style="font-weight: 700; color: red">订单总金额(含税): ¥{{ moneyFormat(calculatedTotalAmount(), 2) }}</span>
@@ -861,7 +860,6 @@ const calculatedTotalAmount = () => {
         calculatedAmount("deliveryMaterialsFee") +
         calculatedAmount("packingLabor") +
         calculatedAmount("managementFee") +
-        calculatedOuterBoxPackingFee() +
         calculatedPackagingMaterialCost()) *
         100
     ) / 100
@@ -944,7 +942,6 @@ const handleSubmit = async (flag) => {
         formData.data.deliveryMaterialsFee = calculatedAmount("deliveryMaterialsFee");
         formData.data.packingLabor = calculatedAmount("packingLabor");
         formData.data.managementFee = calculatedAmount("managementFee");
-        formData.data.outerBoxPackingFee = calculatedOuterBoxPackingFee();
         formData.data.packagingMaterialCost = calculatedPackagingMaterialCost();
         formData.data.totalAmount = calculatedTotalAmount();
         if (fileList.value && fileList.value.length > 0) {
@@ -1031,17 +1028,6 @@ const saveShippingPackage = (data) => {
   formData.data.orderPackageBomList = data.orderPackageBomList;
   formData.data.outerBoxSelfAdhesiveStickerFile = data.outerBoxSelfAdhesiveStickerFile;
 };
-const calculatedOuterBoxPackingFee = () => {
-  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].costPrice && formData.data.orderPackageBomList[i].quantity) {
-        money = Number(Math.round((money + formData.data.orderPackageBomList[i].costPrice * formData.data.orderPackageBomList[i].quantity) * 100) / 100);
-      }
-    }
-  }
-  return money;
-};
 // 向父组件暴露
 defineExpose({ getFormData, handleSubmit, saveShippingPackage });
 </script>

src/views/group/finance/check-bill/index.vue

@@ -61,7 +61,6 @@
               <el-table-column label="包装人工费 ¥" prop="packingLabor" align="right" width="110" />
               <el-table-column label="包材费 ¥" prop="packagingMaterialCost" align="right" width="100" />
               <el-table-column label="管理费 ¥" prop="managementFee" align="right" width="100" />
-              <el-table-column label="外箱包装费 ¥" prop="outerBoxPackingFee" align="right" width="110" />
               <el-table-column label="操作" align="center" fixed="right" width="60">
                 <template #default="{ $index }">
                   <el-button type="danger" @click="clickOrderDelete($index)" text>删除</el-button>

src/views/group/finance/check-bill/printOrder.vue

@@ -232,20 +232,14 @@ const columns = computed(() => {
       width: 120,
     },
     {
-      dataKey: "outerBoxPackingFee",
-      key: "column-18",
-      title: "外箱包装费",
-      width: 120,
-    },
-    {
       dataKey: "total",
-      key: "column-19",
+      key: "column-18",
       title: "合计",
       width: 120,
     },
   ];
 });
-const mergeColumnOne = [0, 1, 2, 18, 19];
+const mergeColumnOne = [0, 1, 2, 18];
 const mergeColumnTwo = [3, 4, 5, 16, 17];
 const Row = ({ rowData, cells }) => {
   if (rowData.indexOne > 1) {

src/views/group/finance/summary/printOrder.vue

@@ -238,20 +238,14 @@ const columns = computed(() => {
       width: 120,
     },
     {
-      dataKey: "outerBoxPackingFee",
-      key: "column-18",
-      title: "外箱包装费",
-      width: 120,
-    },
-    {
       dataKey: "total",
-      key: "column-19",
+      key: "column-18",
       title: "合计",
       width: 120,
     },
   ];
 });
-const mergeColumnOne = [0, 1, 2, 18, 19];
+const mergeColumnOne = [0, 1, 2, 18];
 const mergeColumnTwo = [3, 4, 5, 16, 17];
 const Row = ({ rowData, cells }) => {
   if (rowData.indexOne > 1) {

src/views/group/order/already-removed/detail.vue

@@ -223,7 +223,6 @@
               <span style="font-weight: 700; color: #6c88f1; margin-left: 40px">包装人工费: ¥{{ moneyFormat(calculatedAmount("packingLabor"), 2) }}</span>
               <span style="font-weight: 700; color: #6c88f1; margin-left: 40px">包材费: ¥{{ moneyFormat(calculatedPackagingMaterialCost(), 2) }}</span>
               <span style="font-weight: 700; color: #6c88f1; margin-left: 40px">管理费: ¥{{ moneyFormat(calculatedAmount("managementFee"), 2) }}</span>
-              <span style="font-weight: 700; color: #6c88f1; margin-left: 40px">外箱包装费: ¥{{ moneyFormat(calculatedOuterBoxPackingFee(), 2) }}</span>
             </div>
             <div style="padding: 8px 0 0 0">
               <span style="font-weight: 700; color: red">订单总金额(含税): ¥{{ moneyFormat(calculatedTotalAmount(), 2) }}</span>
@@ -596,7 +595,6 @@ const calculatedTotalAmount = () => {
         calculatedAmount("deliveryMaterialsFee") +
         calculatedAmount("packingLabor") +
         calculatedAmount("managementFee") +
-        calculatedOuterBoxPackingFee() +
         calculatedPackagingMaterialCost()) *
         100
     ) / 100
@@ -620,17 +618,6 @@ const onSuccessFile = (any, UploadFile) => {
 const onPreviewFile = (file) => {
   window.open(file.raw.fileUrl, "_blank");
 };
-const calculatedOuterBoxPackingFee = () => {
-  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].costPrice && formData.data.orderPackageBomList[i].quantity) {
-        money = Number(Math.round((money + formData.data.orderPackageBomList[i].costPrice * formData.data.orderPackageBomList[i].quantity) * 100) / 100);
-      }
-    }
-  }
-  return money;
-};
 </script>
 
 <style lang="scss" scoped>

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

@@ -279,7 +279,6 @@
               <span style="font-weight: 700; color: #6c88f1; margin-left: 40px">包装人工费: ¥{{ moneyFormat(calculatedAmount("packingLabor"), 2) }}</span>
               <span style="font-weight: 700; color: #6c88f1; margin-left: 40px">包材费: ¥{{ moneyFormat(calculatedPackagingMaterialCost(), 2) }}</span>
               <span style="font-weight: 700; color: #6c88f1; margin-left: 40px">管理费: ¥{{ moneyFormat(calculatedAmount("managementFee"), 2) }}</span>
-              <span style="font-weight: 700; color: #6c88f1; margin-left: 40px">外箱包装费: ¥{{ moneyFormat(calculatedOuterBoxPackingFee(), 2) }}</span>
             </div>
             <div style="padding: 8px 0 0 0">
               <span style="font-weight: 700; color: red">订单总金额(含税): ¥{{ moneyFormat(calculatedTotalAmount(), 2) }}</span>
@@ -672,7 +671,6 @@ const submitChangePrice = () => {
         formData.data.deliveryMaterialsFee = calculatedAmount("deliveryMaterialsFee");
         formData.data.packingLabor = calculatedAmount("packingLabor");
         formData.data.managementFee = calculatedAmount("managementFee");
-        formData.data.outerBoxPackingFee = calculatedOuterBoxPackingFee();
         formData.data.packagingMaterialCost = calculatedPackagingMaterialCost();
         formData.data.totalAmount = calculatedTotalAmount();
         if (fileList.value && fileList.value.length > 0) {
@@ -837,7 +835,6 @@ const calculatedTotalAmount = () => {
         calculatedAmount("deliveryMaterialsFee") +
         calculatedAmount("packingLabor") +
         calculatedAmount("managementFee") +
-        calculatedOuterBoxPackingFee() +
         calculatedPackagingMaterialCost()) *
         100
     ) / 100
@@ -861,17 +858,6 @@ const onSuccessFile = (any, UploadFile) => {
 const onPreviewFile = (file) => {
   window.open(file.raw.fileUrl, "_blank");
 };
-const calculatedOuterBoxPackingFee = () => {
-  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].costPrice && formData.data.orderPackageBomList[i].quantity) {
-        money = Number(Math.round((money + formData.data.orderPackageBomList[i].costPrice * formData.data.orderPackageBomList[i].quantity) * 100) / 100);
-      }
-    }
-  }
-  return money;
-};
 </script>
 
 <style lang="scss" scoped>

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

@@ -304,17 +304,6 @@ const config = computed(() => {
     },
     {
       attrs: {
-        label: "外箱包装费 ¥",
-        prop: "outerBoxPackingFee",
-        width: 120,
-        align: "right",
-      },
-      render(val) {
-        return proxy.moneyFormat(val);
-      },
-    },
-    {
-      attrs: {
         label: "交期",
         prop: "deliveryTime",
         width: 160,

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

@@ -284,17 +284,6 @@ const config = computed(() => {
     },
     {
       attrs: {
-        label: "外箱包装费 ¥",
-        prop: "outerBoxPackingFee",
-        width: 120,
-        align: "right",
-      },
-      render(val) {
-        return proxy.moneyFormat(val);
-      },
-    },
-    {
-      attrs: {
         label: "下单时间",
         slot: "wlnCreateTime",
         width: 160,

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

@@ -346,7 +346,6 @@
               <span style="font-weight: 700; color: #6c88f1; margin-left: 40px">包装人工费: ¥{{ moneyFormat(calculatedAmount("packingLabor"), 2) }}</span>
               <span style="font-weight: 700; color: #6c88f1; margin-left: 40px">包材费: ¥{{ moneyFormat(calculatedPackagingMaterialCost(), 2) }}</span>
               <span style="font-weight: 700; color: #6c88f1; margin-left: 40px">管理费: ¥{{ moneyFormat(calculatedAmount("managementFee"), 2) }}</span>
-              <span style="font-weight: 700; color: #6c88f1; margin-left: 40px">外箱包装费: ¥{{ moneyFormat(calculatedOuterBoxPackingFee(), 2) }}</span>
             </div>
             <div style="padding: 8px 0 0 0">
               <span style="font-weight: 700; color: red">订单总金额(含税): ¥{{ moneyFormat(calculatedTotalAmount(), 2) }}</span>
@@ -649,7 +648,6 @@ const submitForm = (status) => {
       formData.data.deliveryMaterialsFee = calculatedAmount("deliveryMaterialsFee");
       formData.data.packingLabor = calculatedAmount("packingLabor");
       formData.data.managementFee = calculatedAmount("managementFee");
-      formData.data.outerBoxPackingFee = calculatedOuterBoxPackingFee();
       formData.data.packagingMaterialCost = calculatedPackagingMaterialCost();
       formData.data.totalAmount = calculatedTotalAmount();
       if (fileList.value && fileList.value.length > 0) {
@@ -1006,7 +1004,6 @@ const calculatedTotalAmount = () => {
         calculatedAmount("deliveryMaterialsFee") +
         calculatedAmount("packingLabor") +
         calculatedAmount("managementFee") +
-        calculatedOuterBoxPackingFee() +
         calculatedPackagingMaterialCost()) *
         100
     ) / 100
@@ -1046,17 +1043,6 @@ const handleAdhesiveSuccess = (UploadFile, index) => {
     fileUrl: UploadFile.raw.fileUrl,
   };
 };
-const calculatedOuterBoxPackingFee = () => {
-  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].costPrice && formData.data.orderPackageBomList[i].quantity) {
-        money = Number(Math.round((money + formData.data.orderPackageBomList[i].costPrice * formData.data.orderPackageBomList[i].quantity) * 100) / 100);
-      }
-    }
-  }
-  return money;
-};
 </script>
 
 <style lang="scss" scoped>

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

@@ -274,7 +274,6 @@
               <span style="font-weight: 700; color: #6c88f1; margin-left: 40px">包装人工费: ¥{{ moneyFormat(calculatedAmount("packingLabor"), 2) }}</span>
               <span style="font-weight: 700; color: #6c88f1; margin-left: 40px">包材费: ¥{{ moneyFormat(calculatedPackagingMaterialCost(), 2) }}</span>
               <span style="font-weight: 700; color: #6c88f1; margin-left: 40px">管理费: ¥{{ moneyFormat(calculatedAmount("managementFee"), 2) }}</span>
-              <span style="font-weight: 700; color: #6c88f1; margin-left: 40px">外箱包装费: ¥{{ moneyFormat(calculatedOuterBoxPackingFee(), 2) }}</span>
             </div>
             <div style="padding: 8px 0 0 0">
               <span style="font-weight: 700; color: red">订单总金额(含税): ¥{{ moneyFormat(calculatedTotalAmount(), 2) }}</span>
@@ -526,7 +525,6 @@ const submitForm = (status) => {
       formData.data.deliveryMaterialsFee = calculatedAmount("deliveryMaterialsFee");
       formData.data.packingLabor = calculatedAmount("packingLabor");
       formData.data.managementFee = calculatedAmount("managementFee");
-      formData.data.outerBoxPackingFee = calculatedOuterBoxPackingFee();
       formData.data.packagingMaterialCost = calculatedPackagingMaterialCost();
       formData.data.totalAmount = calculatedTotalAmount();
       if (fileList.value && fileList.value.length > 0) {
@@ -778,7 +776,6 @@ const calculatedTotalAmount = () => {
         calculatedAmount("deliveryMaterialsFee") +
         calculatedAmount("packingLabor") +
         calculatedAmount("managementFee") +
-        calculatedOuterBoxPackingFee() +
         calculatedPackagingMaterialCost()) *
         100
     ) / 100
@@ -818,17 +815,6 @@ const handleAdhesiveSuccess = (UploadFile, index) => {
     fileUrl: UploadFile.raw.fileUrl,
   };
 };
-const calculatedOuterBoxPackingFee = () => {
-  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].costPrice && formData.data.orderPackageBomList[i].quantity) {
-        money = Number(Math.round((money + formData.data.orderPackageBomList[i].costPrice * formData.data.orderPackageBomList[i].quantity) * 100) / 100);
-      }
-    }
-  }
-  return money;
-};
 </script>
 
 <style lang="scss" scoped>

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

@@ -248,17 +248,6 @@ const config = computed(() => {
     },
     {
       attrs: {
-        label: "外箱包装费 ¥",
-        prop: "outerBoxPackingFee",
-        width: 120,
-        align: "right",
-      },
-      render(val) {
-        return proxy.moneyFormat(val);
-      },
-    },
-    {
-      attrs: {
         label: "交期",
         prop: "deliveryTime",
         width: 160,

src/views/subsidiary/order/productManagement/index.vue

@@ -269,17 +269,6 @@ const config = computed(() => {
     },
     {
       attrs: {
-        label: "外箱包装费 ¥",
-        prop: "outerBoxPackingFee",
-        width: 120,
-        align: "right",
-      },
-      render(val) {
-        return proxy.moneyFormat(val);
-      },
-    },
-    {
-      attrs: {
         label: "下单时间",
         slot: "wlnCreateTime",
         width: 160,