lxf пре 1 година
родитељ
комит
8c9fa8a752

+ 2 - 0
src/views/group/finance/check-bill/index.vue

@@ -60,6 +60,7 @@
               <el-table-column label="快递包材费 ¥" prop="deliveryMaterialsFee" align="right" width="110" />
               <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="操作" align="center" fixed="right" width="60">
                 <template #default="{ $index }">
                   <el-button type="danger" @click="clickOrderDelete($index)" text>删除</el-button>
@@ -386,6 +387,7 @@ const selectOrder = (row) => {
     lssueFee: row.lssueFee,
     deliveryMaterialsFee: row.deliveryMaterialsFee,
     packingLabor: row.packingLabor,
+    managementFee: row.managementFee,
     packagingMaterialCost: row.packagingMaterialCost,
   });
   ElMessage({ message: "添加成功", type: "success" });

+ 4 - 2
src/views/group/finance/check-bill/printBOM.vue

@@ -17,6 +17,7 @@
             <el-table-column label="代发费汇总" align="center" prop="lssueFeeSummary" width="110" />
             <el-table-column label="快递包材费汇总" align="center" prop="deliveryMaterialsFeeSummary" width="130" />
             <el-table-column label="包装人工费汇总" align="center" prop="packingLaborSummary" width="130" />
+            <el-table-column label="管理费汇总" align="center" prop="managementFeeSummary" width="130" />
             <el-table-column label="小计" align="center" width="120">
               <template #default="{ row }">
                 {{ moneyFormat(row.subtotal) }}
@@ -69,8 +70,9 @@ const labelList = ref({
   6: "lssueFeeSummary",
   7: "deliveryMaterialsFeeSummary",
   8: "packingLaborSummary",
-  9: "subtotal",
-  10: "total",
+  9: "managementFeeSummary",
+  10: "subtotal",
+  11: "total",
 });
 const textList = ref({
   1: "胜德体育总经理:",

+ 5 - 3
src/views/group/finance/check-bill/printOrder.vue

@@ -3,12 +3,12 @@
     <div style="zoom: 0.8">
       <table class="tableOne" border="0" cellpadding="0" cellspacing="0">
         <tr>
-          <th colspan="18" style="border-right: 0; border-top: 0">
+          <th colspan="19" style="border-right: 0; border-top: 0">
             <div style="text-align: center; font-size: 30px; padding: 8px">{{ props.rowData.departmentName }}-胜德体育对账单</div>
           </th>
         </tr>
         <tr>
-          <th colspan="18" style="border-bottom: 1px solid black; border-right: 0">
+          <th colspan="19" style="border-bottom: 1px solid black; border-right: 0">
             <div style="text-align: center; font-size: 18px; padding-bottom: 8px">( 对账时间: {{ rowData.timePeriod }} )</div>
           </th>
         </tr>
@@ -28,6 +28,7 @@
           <th style="width: 65px">代发费</th>
           <th style="width: 70px">快递包材费</th>
           <th style="width: 70px">包装人工费</th>
+          <th style="width: 70px">管理费</th>
           <th style="width: 80px">SKU单价</th>
           <th style="width: 80px">小计</th>
           <th style="border-right: 0; width: 90px">合计</th>
@@ -49,6 +50,7 @@
             <td>{{ itemBom.lssueFeeSummary }}</td>
             <td>{{ itemBom.deliveryMaterialsFeeSummary }}</td>
             <td>{{ itemBom.packingLaborSummary }}</td>
+            <td>{{ itemBom.managementFeeSummary }}</td>
             <td v-if="indexBom === 0" :rowspan="item.bomSpecList.length">{{ item.unitPrice }}</td>
             <td v-if="indexBom === 0" :rowspan="item.bomSpecList.length">{{ moneyFormat(item.subtotal) }}</td>
             <td style="border-right: 0" v-if="indexBom === 0" :rowspan="item.bomSpecList.length">{{ moneyFormat(item.total) }}</td>
@@ -56,7 +58,7 @@
         </tbody>
         <tr>
           <td>总计:</td>
-          <td colspan="16"></td>
+          <td colspan="17"></td>
           <td style="border-right: 0">
             <span>{{ getAggregate() }}</span>
           </td>

+ 4 - 2
src/views/group/finance/summary/printBOM.vue

@@ -12,6 +12,7 @@
           <el-table-column label="代发费汇总" align="center" prop="lssueFeeSummary" width="110" />
           <el-table-column label="快递包材费汇总" align="center" prop="deliveryMaterialsFeeSummary" width="130" />
           <el-table-column label="包装人工费汇总" align="center" prop="packingLaborSummary" width="130" />
+          <el-table-column label="管理费汇总" align="center" prop="managementFeeSummary" width="130" />
           <el-table-column label="小计" align="center" width="120">
             <template #default="{ row }">
               {{ moneyFormat(row.subtotal) }}
@@ -61,8 +62,9 @@ const labelList = ref({
   6: "lssueFeeSummary",
   7: "deliveryMaterialsFeeSummary",
   8: "packingLaborSummary",
-  9: "subtotal",
-  10: "total",
+  9: "managementFeeSummary",
+  10: "subtotal",
+  11: "total",
 });
 const textList = ref({
   1: "胜德体育总经理:",

+ 3 - 1
src/views/group/finance/summary/printOrder.vue

@@ -18,6 +18,7 @@
           <th style="width: 65px">代发费</th>
           <th style="width: 70px">快递包材费</th>
           <th style="width: 70px">包装人工费</th>
+          <th style="width: 70px">管理费</th>
           <th style="width: 80px">SKU单价</th>
           <th style="width: 80px">小计</th>
           <th style="border-right: 0; width: 90px">合计</th>
@@ -39,6 +40,7 @@
             <td>{{ itemBom.lssueFeeSummary }}</td>
             <td>{{ itemBom.deliveryMaterialsFeeSummary }}</td>
             <td>{{ itemBom.packingLaborSummary }}</td>
+            <td>{{ itemBom.managementFeeSummary }}</td>
             <td v-if="indexBom === 0" :rowspan="item.bomSpecList.length">{{ item.unitPrice }}</td>
             <td v-if="indexBom === 0" :rowspan="item.bomSpecList.length">{{ moneyFormat(item.subtotal) }}</td>
             <td style="border-right: 0" v-if="indexBom === 0" :rowspan="item.bomSpecList.length">{{ moneyFormat(item.total) }}</td>
@@ -46,7 +48,7 @@
         </tbody>
         <tr>
           <td>总计:</td>
-          <td colspan="16"></td>
+          <td colspan="17"></td>
           <td style="border-right: 0">
             <span>{{ getAggregate() }}</span>
           </td>

+ 19 - 5
src/views/group/order/already-removed/detail.vue

@@ -116,6 +116,10 @@
                             <span>{{ item.packingLabor }}</span>
                           </div>
                           <div style="line-height: 35px">
+                            <span style="color: black; font-weight: 700">管理费: </span>
+                            <span>{{ item.managementFee }}</span>
+                          </div>
+                          <div style="line-height: 35px">
                             <span style="color: black; font-weight: 700">单价: </span>
                             <span>{{ item.unitPrice }}</span>
                           </div>
@@ -243,6 +247,7 @@
               <span style="font-weight: 700; color: #6c88f1; margin-left: 40px">快递包材费: ¥{{ moneyFormat(formData.data.deliveryMaterialsFee, 2) }}</span>
               <span style="font-weight: 700; color: #6c88f1; margin-left: 40px">包装人工费: ¥{{ moneyFormat(formData.data.packingLabor, 2) }}</span>
               <span style="font-weight: 700; color: #6c88f1; margin-left: 40px">包材费: ¥{{ moneyFormat(formData.data.packagingMaterialCost, 2) }}</span>
+              <span style="font-weight: 700; color: #6c88f1; margin-left: 40px">管理费: ¥{{ moneyFormat(formData.data.managementFee, 2) }}</span>
             </div>
             <div style="padding: 8px 0 0 0">
               <span style="font-weight: 700; color: red">订单总金额(含税): ¥{{ moneyFormat(formData.data.totalAmount, 2) }}</span>
@@ -415,9 +420,9 @@ const openFile = (path) => {
 const clickCancel = () => {
   const useTagsStore = useTagsViewStore();
   useTagsStore.delVisitedView(router.currentRoute.value);
-    router.replace({
-      path: "/group/order/already-removed",
-    });
+  router.replace({
+    path: "/group/order/already-removed",
+  });
 };
 onMounted(() => {
   if (route.query && (route.query.id || route.query.detailId)) {
@@ -462,6 +467,7 @@ const getOrderDetail = (parameter) => {
                 formData.data.orderSkuList[i].deliveryMaterialsFee +
                 formData.data.orderSkuList[i].lssueFee +
                 formData.data.orderSkuList[i].packingLabor +
+                formData.data.orderSkuList[i].managementFee +
                 formData.data.orderSkuList[i].unitPrice) *
                 formData.data.orderSkuList[i].quantity *
                 100
@@ -535,10 +541,11 @@ const changeQuantity = (index) => {
         formData.data.orderSkuList[index].deliveryMaterialsFee = res.deliveryMaterialsFee;
         formData.data.orderSkuList[index].lssueFee = res.lssueFee;
         formData.data.orderSkuList[index].packingLabor = res.packingLabor;
+        formData.data.orderSkuList[index].managementFee = res.managementFee;
         formData.data.orderSkuList[index].unitPrice = res.unitPrice;
         formData.data.orderSkuList[index].subtotal = Number(
           Math.round(
-            (res.customProcessingFee + res.deliveryMaterialsFee + res.lssueFee + res.packingLabor + res.unitPrice) *
+            (res.customProcessingFee + res.deliveryMaterialsFee + res.lssueFee + res.packingLabor + res.managementFee + res.unitPrice) *
               formData.data.orderSkuList[index].quantity *
               100
           ) / 100
@@ -583,6 +590,7 @@ const calculatedAmount = () => {
   let lssueFee = 0;
   let deliveryMaterialsFee = 0;
   let packingLabor = 0;
+  let managementFee = 0;
   let packagingMaterialCost = 0;
   let totalAmount = 0;
   if (formData.data.orderSkuList && formData.data.orderSkuList.length > 0) {
@@ -604,6 +612,11 @@ const calculatedAmount = () => {
         if (formData.data.orderSkuList[i].packingLabor) {
           packingLabor = Number(Math.round((packingLabor + formData.data.orderSkuList[i].packingLabor * formData.data.orderSkuList[i].quantity) * 100) / 100);
         }
+        if (formData.data.orderSkuList[i].managementFee) {
+          managementFee = Number(
+            Math.round((managementFee + formData.data.orderSkuList[i].managementFee * formData.data.orderSkuList[i].quantity) * 100) / 100
+          );
+        }
         if (formData.data.orderSkuList[i].unitPrice) {
           productTotalAmount = Number(
             Math.round((productTotalAmount + formData.data.orderSkuList[i].unitPrice * formData.data.orderSkuList[i].quantity) * 100) / 100
@@ -639,9 +652,10 @@ const calculatedAmount = () => {
   formData.data.lssueFee = lssueFee;
   formData.data.deliveryMaterialsFee = deliveryMaterialsFee;
   formData.data.packingLabor = packingLabor;
+  formData.data.managementFee = managementFee;
   formData.data.packagingMaterialCost = packagingMaterialCost;
   totalAmount = Number(
-    Math.round((productTotalAmount + customProcessingFee + lssueFee + deliveryMaterialsFee + packingLabor + packagingMaterialCost) * 100) / 100
+    Math.round((productTotalAmount + customProcessingFee + lssueFee + deliveryMaterialsFee + packingLabor + managementFee + packagingMaterialCost) * 100) / 100
   );
   formData.data.totalAmount = totalAmount;
 };

+ 25 - 2
src/views/group/order/management/detail.vue

@@ -148,6 +148,18 @@
                             </el-tooltip>
                           </div>
                           <div style="line-height: 35px">
+                            <span style="color: black; font-weight: 700">管理费: </span>
+                            <span>{{ item.managementFee }}</span>
+                            <el-tooltip content="修改管理费" placement="top" effect="light">
+                              <el-icon
+                                style="margin-left: 10px; transform: translateY(2px); color: #409eff; cursor: pointer"
+                                @click="clickChangePrice(item, index, 'managementFee', '管理费')"
+                                v-if="route.query && route.query.detailId">
+                                <EditPen />
+                              </el-icon>
+                            </el-tooltip>
+                          </div>
+                          <div style="line-height: 35px">
                             <span style="color: black; font-weight: 700">单价: </span>
                             <span>{{ item.unitPrice }}</span>
                             <el-tooltip content="修改单价" placement="top" effect="light">
@@ -291,6 +303,7 @@
               <span style="font-weight: 700; color: #6c88f1; margin-left: 40px">快递包材费: ¥{{ moneyFormat(formData.data.deliveryMaterialsFee, 2) }}</span>
               <span style="font-weight: 700; color: #6c88f1; margin-left: 40px">包装人工费: ¥{{ moneyFormat(formData.data.packingLabor, 2) }}</span>
               <span style="font-weight: 700; color: #6c88f1; margin-left: 40px">包材费: ¥{{ moneyFormat(formData.data.packagingMaterialCost, 2) }}</span>
+              <span style="font-weight: 700; color: #6c88f1; margin-left: 40px">管理费: ¥{{ moneyFormat(formData.data.managementFee, 2) }}</span>
             </div>
             <div style="padding: 8px 0 0 0">
               <span style="font-weight: 700; color: red">订单总金额(含税): ¥{{ moneyFormat(formData.data.totalAmount, 2) }}</span>
@@ -556,6 +569,7 @@ const getOrderDetail = (parameter) => {
                 formData.data.orderSkuList[i].deliveryMaterialsFee +
                 formData.data.orderSkuList[i].lssueFee +
                 formData.data.orderSkuList[i].packingLabor +
+                formData.data.orderSkuList[i].managementFee +
                 formData.data.orderSkuList[i].unitPrice) *
                 formData.data.orderSkuList[i].quantity *
                 100
@@ -629,10 +643,11 @@ const changeQuantity = (index) => {
         formData.data.orderSkuList[index].deliveryMaterialsFee = res.deliveryMaterialsFee;
         formData.data.orderSkuList[index].lssueFee = res.lssueFee;
         formData.data.orderSkuList[index].packingLabor = res.packingLabor;
+        formData.data.orderSkuList[index].managementFee = res.managementFee;
         formData.data.orderSkuList[index].unitPrice = res.unitPrice;
         formData.data.orderSkuList[index].subtotal = Number(
           Math.round(
-            (res.customProcessingFee + res.deliveryMaterialsFee + res.lssueFee + res.packingLabor + res.unitPrice) *
+            (res.customProcessingFee + res.deliveryMaterialsFee + res.lssueFee + res.packingLabor + res.managementFee + res.unitPrice) *
               formData.data.orderSkuList[index].quantity *
               100
           ) / 100
@@ -677,6 +692,7 @@ const calculatedAmount = () => {
   let lssueFee = 0;
   let deliveryMaterialsFee = 0;
   let packingLabor = 0;
+  let managementFee = 0;
   let packagingMaterialCost = 0;
   let totalAmount = 0;
   if (formData.data.orderSkuList && formData.data.orderSkuList.length > 0) {
@@ -698,6 +714,11 @@ const calculatedAmount = () => {
         if (formData.data.orderSkuList[i].packingLabor) {
           packingLabor = Number(Math.round((packingLabor + formData.data.orderSkuList[i].packingLabor * formData.data.orderSkuList[i].quantity) * 100) / 100);
         }
+        if (formData.data.orderSkuList[i].managementFee) {
+          managementFee = Number(
+            Math.round((managementFee + formData.data.orderSkuList[i].managementFee * formData.data.orderSkuList[i].quantity) * 100) / 100
+          );
+        }
         if (formData.data.orderSkuList[i].unitPrice) {
           productTotalAmount = Number(
             Math.round((productTotalAmount + formData.data.orderSkuList[i].unitPrice * formData.data.orderSkuList[i].quantity) * 100) / 100
@@ -733,9 +754,10 @@ const calculatedAmount = () => {
   formData.data.lssueFee = lssueFee;
   formData.data.deliveryMaterialsFee = deliveryMaterialsFee;
   formData.data.packingLabor = packingLabor;
+  formData.data.managementFee = managementFee;
   formData.data.packagingMaterialCost = packagingMaterialCost;
   totalAmount = Number(
-    Math.round((productTotalAmount + customProcessingFee + lssueFee + deliveryMaterialsFee + packingLabor + packagingMaterialCost) * 100) / 100
+    Math.round((productTotalAmount + customProcessingFee + lssueFee + deliveryMaterialsFee + packingLabor + managementFee + packagingMaterialCost) * 100) / 100
   );
   formData.data.totalAmount = totalAmount;
 };
@@ -753,6 +775,7 @@ const clickChangePrice = (item, index, label, text) => {
     lssueFee: item.lssueFee,
     deliveryMaterialsFee: item.deliveryMaterialsFee,
     packingLabor: item.packingLabor,
+    managementFee: item.managementFee,
     unitPrice: item.unitPrice,
     customProcessingType: item.customProcessingType,
   };

+ 11 - 0
src/views/group/order/management/index.vue

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

+ 14 - 0
src/views/group/order/product-management/index.vue

@@ -265,6 +265,17 @@ const config = computed(() => {
     },
     {
       attrs: {
+        label: "管理费 ¥",
+        prop: "managementFee",
+        width: 120,
+        align: "right",
+      },
+      render(val) {
+        return proxy.moneyFormat(val);
+      },
+    },
+    {
+      attrs: {
         label: "下单时间",
         slot: "wlnCreateTime",
         width: 160,
@@ -336,6 +347,9 @@ const subtotal = (row) => {
   if (row.packingLabor) {
     money = Number(Math.round((money + row.packingLabor) * 100) / 100);
   }
+  if (row.managementFee) {
+    money = Number(Math.round((money + row.managementFee) * 100) / 100);
+  }
   if (row.packagingMaterialCost) {
     money = Number(Math.round((money + row.packagingMaterialCost) * 100) / 100);
   }

+ 4 - 2
src/views/subsidiary/finance/check-bill/printBOM.vue

@@ -17,6 +17,7 @@
             <el-table-column label="代发费汇总" align="center" prop="lssueFeeSummary" width="110" />
             <el-table-column label="快递包材费汇总" align="center" prop="deliveryMaterialsFeeSummary" width="130" />
             <el-table-column label="包装人工费汇总" align="center" prop="packingLaborSummary" width="130" />
+            <el-table-column label="管理费汇总" align="center" prop="managementFeeSummary" width="130" />
             <el-table-column label="小计" align="center" width="120">
               <template #default="{ row }">
                 {{ moneyFormat(row.subtotal) }}
@@ -69,8 +70,9 @@ const labelList = ref({
   6: "lssueFeeSummary",
   7: "deliveryMaterialsFeeSummary",
   8: "packingLaborSummary",
-  9: "subtotal",
-  10: "total",
+  9: "managementFeeSummary",
+  10: "subtotal",
+  11: "total",
 });
 const textList = ref({
   1: "胜德体育总经理:",

+ 5 - 3
src/views/subsidiary/finance/check-bill/printOrder.vue

@@ -3,12 +3,12 @@
     <div style="zoom: 0.8">
       <table class="tableOne" border="0" cellpadding="0" cellspacing="0">
         <tr>
-          <th colspan="18" style="border-right: 0; border-top: 0">
+          <th colspan="19" style="border-right: 0; border-top: 0">
             <div style="text-align: center; font-size: 30px; padding: 8px">{{ props.rowData.departmentName }}-胜德体育对账单</div>
           </th>
         </tr>
         <tr>
-          <th colspan="18" style="border-bottom: 1px solid black; border-right: 0">
+          <th colspan="19" style="border-bottom: 1px solid black; border-right: 0">
             <div style="text-align: center; font-size: 18px; padding-bottom: 8px">( 对账时间: {{ rowData.timePeriod }} )</div>
           </th>
         </tr>
@@ -28,6 +28,7 @@
           <th style="width: 65px">代发费</th>
           <th style="width: 70px">快递包材费</th>
           <th style="width: 70px">包装人工费</th>
+          <th style="width: 70px">管理费</th>
           <th style="width: 80px">SKU单价</th>
           <th style="width: 80px">小计</th>
           <th style="border-right: 0; width: 90px">合计</th>
@@ -49,6 +50,7 @@
             <td>{{ itemBom.lssueFeeSummary }}</td>
             <td>{{ itemBom.deliveryMaterialsFeeSummary }}</td>
             <td>{{ itemBom.packingLaborSummary }}</td>
+            <td>{{ itemBom.managementFeeSummary }}</td>
             <td v-if="indexBom === 0" :rowspan="item.bomSpecList.length">{{ item.unitPrice }}</td>
             <td v-if="indexBom === 0" :rowspan="item.bomSpecList.length">{{ moneyFormat(item.subtotal) }}</td>
             <td style="border-right: 0" v-if="indexBom === 0" :rowspan="item.bomSpecList.length">{{ moneyFormat(item.total) }}</td>
@@ -56,7 +58,7 @@
         </tbody>
         <tr>
           <td>总计:</td>
-          <td colspan="16"></td>
+          <td colspan="17"></td>
           <td style="border-right: 0">
             <span>{{ getAggregate() }}</span>
           </td>

+ 4 - 2
src/views/subsidiary/finance/summary/printBOM.vue

@@ -12,6 +12,7 @@
           <el-table-column label="代发费汇总" align="center" prop="lssueFeeSummary" width="110" />
           <el-table-column label="快递包材费汇总" align="center" prop="deliveryMaterialsFeeSummary" width="130" />
           <el-table-column label="包装人工费汇总" align="center" prop="packingLaborSummary" width="130" />
+          <el-table-column label="管理费汇总" align="center" prop="managementFeeSummary" width="130" />
           <el-table-column label="小计" align="center" width="120">
             <template #default="{ row }">
               {{ moneyFormat(row.subtotal) }}
@@ -61,8 +62,9 @@ const labelList = ref({
   6: "lssueFeeSummary",
   7: "deliveryMaterialsFeeSummary",
   8: "packingLaborSummary",
-  9: "subtotal",
-  10: "total",
+  9: "managementFeeSummary",
+  10: "subtotal",
+  11: "total",
 });
 const textList = ref({
   1: "胜德体育总经理:",

+ 3 - 1
src/views/subsidiary/finance/summary/printOrder.vue

@@ -18,6 +18,7 @@
           <th style="width: 65px">代发费</th>
           <th style="width: 70px">快递包材费</th>
           <th style="width: 70px">包装人工费</th>
+          <th style="width: 70px">管理费</th>
           <th style="width: 80px">SKU单价</th>
           <th style="width: 80px">小计</th>
           <th style="border-right: 0; width: 90px">合计</th>
@@ -39,6 +40,7 @@
             <td>{{ itemBom.lssueFeeSummary }}</td>
             <td>{{ itemBom.deliveryMaterialsFeeSummary }}</td>
             <td>{{ itemBom.packingLaborSummary }}</td>
+            <td>{{ itemBom.managementFeeSummary }}</td>
             <td v-if="indexBom === 0" :rowspan="item.bomSpecList.length">{{ item.unitPrice }}</td>
             <td v-if="indexBom === 0" :rowspan="item.bomSpecList.length">{{ moneyFormat(item.subtotal) }}</td>
             <td style="border-right: 0" v-if="indexBom === 0" :rowspan="item.bomSpecList.length">{{ moneyFormat(item.total) }}</td>
@@ -46,7 +48,7 @@
         </tbody>
         <tr>
           <td>总计:</td>
-          <td colspan="16"></td>
+          <td colspan="17"></td>
           <td style="border-right: 0">
             <span>{{ getAggregate() }}</span>
           </td>

+ 17 - 2
src/views/subsidiary/order/management/add.vue

@@ -119,6 +119,10 @@
                             <span>{{ item.packingLabor }}</span>
                           </div>
                           <div style="line-height: 35px">
+                            <span style="color: black; font-weight: 700">管理费: </span>
+                            <span>{{ item.managementFee }}</span>
+                          </div>
+                          <div style="line-height: 35px">
                             <span style="color: black; font-weight: 700">单价: </span>
                             <span>{{ item.unitPrice }}</span>
                           </div>
@@ -302,6 +306,7 @@
               <span style="font-weight: 700; color: #6c88f1; margin-left: 40px">快递包材费: ¥{{ moneyFormat(formData.data.deliveryMaterialsFee, 2) }}</span>
               <span style="font-weight: 700; color: #6c88f1; margin-left: 40px">包装人工费: ¥{{ moneyFormat(formData.data.packingLabor, 2) }}</span>
               <span style="font-weight: 700; color: #6c88f1; margin-left: 40px">包材费: ¥{{ moneyFormat(formData.data.packagingMaterialCost, 2) }}</span>
+              <span style="font-weight: 700; color: #6c88f1; margin-left: 40px">管理费: ¥{{ moneyFormat(formData.data.managementFee, 2) }}</span>
             </div>
             <div style="padding: 8px 0 0 0">
               <span style="font-weight: 700; color: red">订单总金额(含税): ¥{{ moneyFormat(formData.data.totalAmount, 2) }}</span>
@@ -602,6 +607,7 @@ const getOrderDetail = (parameter) => {
                 formData.data.orderSkuList[i].deliveryMaterialsFee +
                 formData.data.orderSkuList[i].lssueFee +
                 formData.data.orderSkuList[i].packingLabor +
+                formData.data.orderSkuList[i].managementFee +
                 formData.data.orderSkuList[i].unitPrice) *
                 formData.data.orderSkuList[i].quantity *
                 100
@@ -688,6 +694,7 @@ const selectProduct = (row, bom) => {
       lssueFee: "",
       deliveryMaterialsFee: "",
       packingLabor: "",
+      managementFee: "",
       unitPrice: "",
       printType: "1",
       packageRemark: "",
@@ -747,10 +754,11 @@ const changeQuantity = (index) => {
         formData.data.orderSkuList[index].deliveryMaterialsFee = res.deliveryMaterialsFee;
         formData.data.orderSkuList[index].lssueFee = res.lssueFee;
         formData.data.orderSkuList[index].packingLabor = res.packingLabor;
+        formData.data.orderSkuList[index].managementFee = res.managementFee;
         formData.data.orderSkuList[index].unitPrice = res.unitPrice;
         formData.data.orderSkuList[index].subtotal = Number(
           Math.round(
-            (res.customProcessingFee + res.deliveryMaterialsFee + res.lssueFee + res.packingLabor + res.unitPrice) *
+            (res.customProcessingFee + res.deliveryMaterialsFee + res.lssueFee + res.packingLabor + res.managementFee + res.unitPrice) *
               formData.data.orderSkuList[index].quantity *
               100
           ) / 100
@@ -795,6 +803,7 @@ const calculatedAmount = () => {
   let lssueFee = 0;
   let deliveryMaterialsFee = 0;
   let packingLabor = 0;
+  let managementFee = 0;
   let packagingMaterialCost = 0;
   let totalAmount = 0;
   if (formData.data.orderSkuList && formData.data.orderSkuList.length > 0) {
@@ -816,6 +825,11 @@ const calculatedAmount = () => {
         if (formData.data.orderSkuList[i].packingLabor) {
           packingLabor = Number(Math.round((packingLabor + formData.data.orderSkuList[i].packingLabor * formData.data.orderSkuList[i].quantity) * 100) / 100);
         }
+        if (formData.data.orderSkuList[i].managementFee) {
+          managementFee = Number(
+            Math.round((managementFee + formData.data.orderSkuList[i].managementFee * formData.data.orderSkuList[i].quantity) * 100) / 100
+          );
+        }
         if (formData.data.orderSkuList[i].unitPrice) {
           productTotalAmount = Number(
             Math.round((productTotalAmount + formData.data.orderSkuList[i].unitPrice * formData.data.orderSkuList[i].quantity) * 100) / 100
@@ -851,9 +865,10 @@ const calculatedAmount = () => {
   formData.data.lssueFee = lssueFee;
   formData.data.deliveryMaterialsFee = deliveryMaterialsFee;
   formData.data.packingLabor = packingLabor;
+  formData.data.managementFee = managementFee;
   formData.data.packagingMaterialCost = packagingMaterialCost;
   totalAmount = Number(
-    Math.round((productTotalAmount + customProcessingFee + lssueFee + deliveryMaterialsFee + packingLabor + packagingMaterialCost) * 100) / 100
+    Math.round((productTotalAmount + customProcessingFee + lssueFee + deliveryMaterialsFee + packingLabor + managementFee + packagingMaterialCost) * 100) / 100
   );
   formData.data.totalAmount = totalAmount;
 };

+ 6 - 0
src/views/subsidiary/order/management/design.vue

@@ -50,6 +50,10 @@
                             <span>{{ item.packingLabor }}</span>
                           </div>
                           <div style="line-height: 35px">
+                            <span style="color: black; font-weight: 700">管理费: </span>
+                            <span>{{ item.managementFee }}</span>
+                          </div>
+                          <div style="line-height: 35px">
                             <span style="color: black; font-weight: 700">单价: </span>
                             <span>{{ item.unitPrice }}</span>
                           </div>
@@ -204,6 +208,7 @@
               <span style="font-weight: 700; color: #6c88f1; margin-left: 40px">快递包材费: ¥{{ moneyFormat(formData.data.deliveryMaterialsFee, 2) }}</span>
               <span style="font-weight: 700; color: #6c88f1; margin-left: 40px">包装人工费: ¥{{ moneyFormat(formData.data.packingLabor, 2) }}</span>
               <span style="font-weight: 700; color: #6c88f1; margin-left: 40px">包材费: ¥{{ moneyFormat(formData.data.packagingMaterialCost, 2) }}</span>
+              <span style="font-weight: 700; color: #6c88f1; margin-left: 40px">管理费: ¥{{ moneyFormat(formData.data.managementFee, 2) }}</span>
             </div>
             <div style="padding: 8px 0 0 0">
               <span style="font-weight: 700; color: red">订单总金额(含税): ¥{{ moneyFormat(formData.data.totalAmount, 2) }}</span>
@@ -420,6 +425,7 @@ const getOrderDetail = (parameter) => {
                 formData.data.orderSkuList[i].deliveryMaterialsFee +
                 formData.data.orderSkuList[i].lssueFee +
                 formData.data.orderSkuList[i].packingLabor +
+                formData.data.orderSkuList[i].managementFee +
                 formData.data.orderSkuList[i].unitPrice) *
                 formData.data.orderSkuList[i].quantity *
                 100

+ 11 - 0
src/views/subsidiary/order/management/index.vue

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

+ 14 - 0
src/views/subsidiary/order/productManagement/index.vue

@@ -258,6 +258,17 @@ const config = computed(() => {
     },
     {
       attrs: {
+        label: "管理费 ¥",
+        prop: "managementFee",
+        width: 120,
+        align: "right",
+      },
+      render(val) {
+        return proxy.moneyFormat(val);
+      },
+    },
+    {
+      attrs: {
         label: "下单时间",
         slot: "wlnCreateTime",
         width: 160,
@@ -314,6 +325,9 @@ const subtotal = (row) => {
   if (row.packingLabor) {
     money = Number(Math.round((money + row.packingLabor) * 100) / 100);
   }
+  if (row.managementFee) {
+    money = Number(Math.round((money + row.managementFee) * 100) / 100);
+  }
   if (row.packagingMaterialCost) {
     money = Number(Math.round((money + row.packagingMaterialCost) * 100) / 100);
   }