新建订单流程

src/components/process/order.vue

@@ -337,6 +337,7 @@
             <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>
@@ -860,6 +861,7 @@ const calculatedTotalAmount = () => {
         calculatedAmount("deliveryMaterialsFee") +
         calculatedAmount("packingLabor") +
         calculatedAmount("managementFee") +
+        calculatedOuterBoxPackingFee() +
         calculatedPackagingMaterialCost()) *
         100
     ) / 100
@@ -942,6 +944,7 @@ 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) {
@@ -1028,6 +1031,17 @@ 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,6 +61,7 @@
               <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,14 +232,20 @@ const columns = computed(() => {
       width: 120,
     },
     {
-      dataKey: "total",
+      dataKey: "outerBoxPackingFee",
       key: "column-18",
+      title: "外箱包装费",
+      width: 120,
+    },
+    {
+      dataKey: "total",
+      key: "column-19",
       title: "合计",
       width: 120,
     },
   ];
 });
-const mergeColumnOne = [0, 1, 2, 18];
+const mergeColumnOne = [0, 1, 2, 18, 19];
 const mergeColumnTwo = [3, 4, 5, 16, 17];
 const Row = ({ rowData, cells }) => {
   if (rowData.indexOne > 1) {

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

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

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

@@ -223,6 +223,7 @@
               <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>
@@ -595,6 +596,7 @@ const calculatedTotalAmount = () => {
         calculatedAmount("deliveryMaterialsFee") +
         calculatedAmount("packingLabor") +
         calculatedAmount("managementFee") +
+        calculatedOuterBoxPackingFee() +
         calculatedPackagingMaterialCost()) *
         100
     ) / 100
@@ -618,6 +620,17 @@ 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,6 +279,7 @@
               <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>
@@ -671,6 +672,7 @@ 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) {
@@ -835,6 +837,7 @@ const calculatedTotalAmount = () => {
         calculatedAmount("deliveryMaterialsFee") +
         calculatedAmount("packingLabor") +
         calculatedAmount("managementFee") +
+        calculatedOuterBoxPackingFee() +
         calculatedPackagingMaterialCost()) *
         100
     ) / 100
@@ -858,6 +861,17 @@ 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,6 +304,17 @@ const config = computed(() => {
     },
     {
       attrs: {
+        label: "外箱包装费 ¥",
+        prop: "outerBoxPackingFee",
+        width: 120,
+        align: "right",
+      },
+      render(val) {
+        return proxy.moneyFormat(val);
+      },
+    },
+    {
+      attrs: {
         label: "交期",
         prop: "deliveryTime",
         width: 160,
@@ -461,10 +472,13 @@ const clickReset = () => {
 };
 const clickCode = (row) => {
   proxy.$router.replace({
-    path: "/order-detail",
+    path: "/platform_manage/process/processApproval",
     query: {
-      detailId: row.id,
-      text: "订单详情",
+      flowKey: "order",
+      flowName: "订单详情",
+      processType: "20",
+      id: row.id,
+      flowId: row.flowId,
       random: proxy.random(),
     },
   });

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

@@ -284,6 +284,17 @@ 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,6 +346,7 @@
               <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>
@@ -648,6 +649,7 @@ 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) {
@@ -1004,6 +1006,7 @@ const calculatedTotalAmount = () => {
         calculatedAmount("deliveryMaterialsFee") +
         calculatedAmount("packingLabor") +
         calculatedAmount("managementFee") +
+        calculatedOuterBoxPackingFee() +
         calculatedPackagingMaterialCost()) *
         100
     ) / 100
@@ -1043,6 +1046,17 @@ 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,6 +274,7 @@
               <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>
@@ -525,6 +526,7 @@ 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) {
@@ -776,6 +778,7 @@ const calculatedTotalAmount = () => {
         calculatedAmount("deliveryMaterialsFee") +
         calculatedAmount("packingLabor") +
         calculatedAmount("managementFee") +
+        calculatedOuterBoxPackingFee() +
         calculatedPackagingMaterialCost()) *
         100
     ) / 100
@@ -815,6 +818,17 @@ 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,6 +248,17 @@ const config = computed(() => {
     },
     {
       attrs: {
+        label: "外箱包装费 ¥",
+        prop: "outerBoxPackingFee",
+        width: 120,
+        align: "right",
+      },
+      render(val) {
+        return proxy.moneyFormat(val);
+      },
+    },
+    {
+      attrs: {
         label: "交期",
         prop: "deliveryTime",
         width: 160,
@@ -362,18 +373,23 @@ const clickReset = () => {
 };
 const clickAddOrder = () => {
   proxy.$router.replace({
-    path: "/addOrder",
+    path: "/platform_manage/process/processApproval",
     query: {
+      flowKey: "order",
+      flowName: "新建订单流程",
       random: proxy.random(),
     },
   });
 };
 const clickCode = (row) => {
   proxy.$router.replace({
-    path: "/addOrder",
+    path: "/platform_manage/process/processApproval",
     query: {
-      detailId: row.id,
-      text: "订单详情",
+      flowKey: "order",
+      flowName: "订单详情",
+      processType: "20",
+      id: row.id,
+      flowId: row.flowId,
       random: proxy.random(),
     },
   });
@@ -394,10 +410,12 @@ const clickDelete = (row) => {
 };
 const clickUpdate = (row) => {
   proxy.$router.replace({
-    path: "/addOrder",
+    path: "/platform_manage/process/processApproval",
     query: {
+      flowKey: "order",
+      flowName: "新建订单流程",
+      processType: "40",
       id: row.id,
-      text: "编辑订单",
       random: proxy.random(),
     },
   });

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

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