相关页面增加打样费

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

@@ -202,6 +202,10 @@
                             <span>{{ getSubtotal(item) }}</span>
                           </div>
                           <div style="line-height: 35px">
+                            <span style="color: black; font-weight: 700">打样费: </span>
+                            <span>{{ item.proofingFee }}</span>
+                          </div>
+                          <div style="line-height: 35px">
                             <span style="width: 37px; color: black; font-weight: 700">打印: </span>
                             <el-form-item
                               :prop="'orderSkuList.' + index + '.printType'"
@@ -361,6 +365,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(getProofingFee(), 2) }}</span>
             </div>
             <div style="padding: 8px 0 0 0">
               <span style="font-weight: 700; color: red">订单总金额(含税): ¥{{ moneyFormat(calculatedTotalAmount(), 2) }}</span>
@@ -831,6 +836,7 @@ const clickRefresh = (index, label) => {
   formData.data.managementFee = calculatedAmount("managementFee");
   formData.data.packagingMaterialCost = calculatedPackagingMaterialCost();
   formData.data.totalAmount = calculatedTotalAmount();
+  formData.data.proofingFee = getProofingFee();
   if (fileList.value && fileList.value.length > 0) {
     formData.data.fileList = fileList.value.map((item) => {
       return {
@@ -885,6 +891,7 @@ const submitChangePrice = () => {
         formData.data.managementFee = calculatedAmount("managementFee");
         formData.data.packagingMaterialCost = calculatedPackagingMaterialCost();
         formData.data.totalAmount = calculatedTotalAmount();
+        formData.data.proofingFee = getProofingFee();
         if (fileList.value && fileList.value.length > 0) {
           formData.data.fileList = fileList.value.map((item) => {
             return {
@@ -932,6 +939,7 @@ const submitChangePrice = () => {
         formData.data.managementFee = calculatedAmount("managementFee");
         formData.data.packagingMaterialCost = calculatedPackagingMaterialCost();
         formData.data.totalAmount = calculatedTotalAmount();
+        formData.data.proofingFee = getProofingFee();
         if (fileList.value && fileList.value.length > 0) {
           formData.data.fileList = fileList.value.map((item) => {
             return {
@@ -993,6 +1001,7 @@ const clickBomPriceRefresh = (index, indexBOM, label) => {
   formData.data.managementFee = calculatedAmount("managementFee");
   formData.data.packagingMaterialCost = calculatedPackagingMaterialCost();
   formData.data.totalAmount = calculatedTotalAmount();
+  formData.data.proofingFee = getProofingFee();
   if (fileList.value && fileList.value.length > 0) {
     formData.data.fileList = fileList.value.map((item) => {
       return {
@@ -1061,6 +1070,17 @@ const calculatedAmount = (label) => {
   }
   return money;
 };
+const getProofingFee = () => {
+  let money = 0;
+  if (formData.data.orderSkuList && formData.data.orderSkuList.length > 0) {
+    for (let i = 0; i < formData.data.orderSkuList.length; i++) {
+      if (formData.data.orderSkuList[i].proofingFee) {
+        money = Number(Math.round((money + formData.data.orderSkuList[i].proofingFee) * 100) / 100);
+      }
+    }
+  }
+  return money;
+};
 const calculatedPackagingMaterialCost = () => {
   let money = 0;
   if (formData.data.orderSkuList && formData.data.orderSkuList.length > 0) {
@@ -1094,6 +1114,7 @@ const calculatedTotalAmount = () => {
         computeDeliveryMaterialsFee() +
         calculatedAmount("packingLabor") +
         calculatedAmount("managementFee") +
+        getProofingFee() +
         calculatedPackagingMaterialCost()) *
         100
     ) / 100
@@ -1189,6 +1210,7 @@ const submitChangeWlnCode = () => {
       formData.data.managementFee = calculatedAmount("managementFee");
       formData.data.packagingMaterialCost = calculatedPackagingMaterialCost();
       formData.data.totalAmount = calculatedTotalAmount();
+      formData.data.proofingFee = getProofingFee();
       if (fileList.value && fileList.value.length > 0) {
         formData.data.fileList = fileList.value.map((item) => {
           return {

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

@@ -382,6 +382,17 @@ const config = computed(() => {
     },
     {
       attrs: {
+        label: "打样费 ¥",
+        prop: "proofingFee",
+        width: 120,
+        align: "right",
+      },
+      render(val) {
+        return proxy.moneyFormat(val);
+      },
+    },
+    {
+      attrs: {
         label: "交期",
         prop: "deliveryTime",
         width: 160,

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

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

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

@@ -828,6 +828,7 @@ const submitForm = (status) => {
       formData.data.managementFee = calculatedAmount("managementFee");
       formData.data.packagingMaterialCost = calculatedPackagingMaterialCost();
       formData.data.totalAmount = calculatedTotalAmount();
+      formData.data.proofingFee = 0;
       if (fileList.value && fileList.value.length > 0) {
         for (let i = 0; i < fileList.value.length; i++) {
           if (fileList.value[i].raw.uploadState) {
@@ -1273,6 +1274,7 @@ const clickSaveShippingPackage = () => {
       if (formData.data.orderPackageBomList && formData.data.orderPackageBomList.length > 0) {
         formData.data.deliveryMaterialsFee = computeDeliveryMaterialsFee();
         formData.data.totalAmount = calculatedTotalAmount();
+        formData.data.proofingFee = 0;
         let type = "add";
         if (formData.data.id && status == "20") {
           proxy.post("/orderInfo/confirmation", formData.data).then(() => {
@@ -1302,6 +1304,7 @@ const clickSaveShippingPackage = () => {
           .then(() => {
             formData.data.deliveryMaterialsFee = computeDeliveryMaterialsFee();
             formData.data.totalAmount = calculatedTotalAmount();
+            formData.data.proofingFee = 0;
             let type = "add";
             if (formData.data.id) {
               type = "edit";

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

@@ -88,6 +88,10 @@
                             <span>{{ getSubtotal(item) }}</span>
                           </div>
                           <div style="line-height: 35px">
+                            <span style="color: black; font-weight: 700">打样费: </span>
+                            <span>{{ item.proofingFee }}</span>
+                          </div>
+                          <div style="line-height: 35px">
                             <span style="width: 37px; color: black; font-weight: 700">打印: </span>
                             <el-form-item
                               :prop="'orderSkuList.' + index + '.printType'"
@@ -287,6 +291,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(getProofingFee(), 2) }}</span>
             </div>
             <div style="padding: 8px 0 0 0">
               <span style="font-weight: 700; color: red">订单总金额(含税): ¥{{ moneyFormat(calculatedTotalAmount(), 2) }}</span>
@@ -639,6 +644,7 @@ const submitForm = (status) => {
       formData.data.managementFee = calculatedAmount("managementFee");
       formData.data.packagingMaterialCost = calculatedPackagingMaterialCost();
       formData.data.totalAmount = calculatedTotalAmount();
+      formData.data.proofingFee = getProofingFee();
       if (fileList.value && fileList.value.length > 0) {
         formData.data.fileList = fileList.value.map((item) => {
           return {
@@ -864,6 +870,17 @@ const calculatedAmount = (label) => {
   }
   return money;
 };
+const getProofingFee = () => {
+  let money = 0;
+  if (formData.data.orderSkuList && formData.data.orderSkuList.length > 0) {
+    for (let i = 0; i < formData.data.orderSkuList.length; i++) {
+      if (formData.data.orderSkuList[i].proofingFee) {
+        money = Number(Math.round((money + formData.data.orderSkuList[i].proofingFee) * 100) / 100);
+      }
+    }
+  }
+  return money;
+};
 const calculatedPackagingMaterialCost = () => {
   let money = 0;
   if (formData.data.orderSkuList && formData.data.orderSkuList.length > 0) {
@@ -897,6 +914,7 @@ const calculatedTotalAmount = () => {
         computeDeliveryMaterialsFee() +
         calculatedAmount("packingLabor") +
         calculatedAmount("managementFee") +
+        getProofingFee() +
         calculatedPackagingMaterialCost()) *
         100
     ) / 100
@@ -962,6 +980,7 @@ const clickSaveShippingPackage = () => {
       if (formData.data.orderPackageBomList && formData.data.orderPackageBomList.length > 0) {
         formData.data.deliveryMaterialsFee = computeDeliveryMaterialsFee();
         formData.data.totalAmount = calculatedTotalAmount();
+        formData.data.proofingFee = getProofingFee();
         proxy.post("/orderInfo/confirmation", formData.data).then(() => {
           ElMessage({ message: "提交成功", type: "success" });
           refreshStore().setRefresh("order");
@@ -976,6 +995,7 @@ const clickSaveShippingPackage = () => {
           .then(() => {
             formData.data.deliveryMaterialsFee = computeDeliveryMaterialsFee();
             formData.data.totalAmount = calculatedTotalAmount();
+            formData.data.proofingFee = getProofingFee();
             proxy.post("/orderInfo/confirmation", formData.data).then(() => {
               ElMessage({ message: "提交成功", type: "success" });
               refreshStore().setRefresh("order");

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

@@ -252,6 +252,17 @@ const config = computed(() => {
     },
     {
       attrs: {
+        label: "打样费 ¥",
+        prop: "proofingFee",
+        width: 120,
+        align: "right",
+      },
+      render(val) {
+        return proxy.moneyFormat(val);
+      },
+    },
+    {
+      attrs: {
         label: "交期",
         prop: "deliveryTime",
         width: 160,

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

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