Эх сурвалжийг харах

Merge branch '打样订单'

lxf 1 жил өмнө
parent
commit
e13ecc026b

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

@@ -17,6 +17,7 @@
           <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" prop="proofingFeeSummary" width="100" />
           <el-table-column label="小计" align="center" width="120">
             <template #default="{ row }">
               {{ moneyFormat(row.subtotal) }}
@@ -86,8 +87,9 @@ const labelList = ref({
   7: "deliveryMaterialsFeeSummary",
   8: "packingLaborSummary",
   9: "managementFeeSummary",
-  10: "subtotal",
-  11: "total",
+  10: "proofingFeeSummary",
+  11: "subtotal",
+  12: "total",
 });
 const textList = ref({
   1: "胜德体育总经理:",

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

@@ -91,6 +91,7 @@ watch(
                           deliveryMaterialsFeeSummary: res[i].skuSpecList[j].bomSpecList[y].deliveryMaterialsFeeSummary,
                           packingLaborSummary: res[i].skuSpecList[j].bomSpecList[y].packingLaborSummary,
                           managementFeeSummary: res[i].skuSpecList[j].bomSpecList[y].managementFeeSummary,
+                          proofingFeeSummary: res[i].skuSpecList[j].bomSpecList[y].proofingFeeSummary,
                           unitPriceSKU: res[i].skuSpecList[j].unitPrice,
                           total: res[i].total,
                           indexOne: indexOne,
@@ -244,27 +245,33 @@ const columns = computed(() => {
       width: 100,
     },
     {
-      dataKey: "unitPriceSKU",
+      dataKey: "proofingFeeSummary",
       key: "column-16",
+      title: "打样费",
+      width: 100,
+    },
+    {
+      dataKey: "unitPriceSKU",
+      key: "column-17",
       title: "SKU单价",
       width: 100,
     },
     {
       dataKey: "subtotal",
-      key: "column-17",
+      key: "column-18",
       title: "小计",
       width: 120,
     },
     {
       dataKey: "total",
-      key: "column-18",
+      key: "column-19",
       title: "合计",
       width: 120,
     },
   ];
 });
-const mergeColumnOne = [0, 1, 2, 18];
-const mergeColumnTwo = [3, 4, 5, 16, 17];
+const mergeColumnOne = [0, 1, 2, 19];
+const mergeColumnTwo = [3, 4, 5, 17, 18];
 const Row = ({ rowData, cells }) => {
   if (rowData.indexOne > 1) {
     for (let i = 0; i < mergeColumnOne.length; i++) {

+ 3 - 1
src/views/group/finance/sales-shipment/index.vue

@@ -52,6 +52,7 @@
       <el-table-column label="快递包材费" prop="deliveryMaterialsFeeSummary" align="center" width="100" />
       <el-table-column label="包装人工费" prop="packingLaborSummary" align="center" width="100" />
       <el-table-column label="管理费" prop="managementFeeSummary" align="center" width="90" />
+      <el-table-column label="打样费" prop="proofingFeeSummary" align="center" width="90" />
       <el-table-column label="SKU单价" prop="unitPriceSKU" align="center" width="90" />
       <el-table-column label="小计" align="center" width="120">
         <template #default="{ row }">
@@ -262,6 +263,7 @@ const getList = async (req, status) => {
                   deliveryMaterialsFeeSummary: res.rows[i].skuSpecList[j].bomSpecList[y].deliveryMaterialsFeeSummary,
                   packingLaborSummary: res.rows[i].skuSpecList[j].bomSpecList[y].packingLaborSummary,
                   managementFeeSummary: res.rows[i].skuSpecList[j].bomSpecList[y].managementFeeSummary,
+                  proofingFeeSummary: res.rows[i].skuSpecList[j].bomSpecList[y].proofingFeeSummary,
                   unitPriceSKU: res.rows[i].skuSpecList[j].unitPrice,
                   subtotal: res.rows[i].skuSpecList[j].subtotal,
                   outerBoxPackingFee: res.rows[i].outerBoxPackingFee,
@@ -331,7 +333,7 @@ const clickExcelFile = () => {
   openFileList.value = true;
 };
 const objectSpanMethod = ({ rowIndex, columnIndex }) => {
-  if ([0, 1, 2, 3, 4, 5, 6, 7, 8, 22, 23, 24, 25, 26].includes(columnIndex)) {
+  if ([0, 1, 2, 3, 4, 5, 6, 7, 8, 23, 24, 25, 26, 27].includes(columnIndex)) {
     let spanName = [
       "statementOfAccountTime",
       "departmentName",

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

@@ -17,6 +17,7 @@
           <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" prop="proofingFeeSummary" width="100" />
           <el-table-column label="小计" align="center" width="120">
             <template #default="{ row }">
               {{ moneyFormat(row.subtotal) }}
@@ -86,8 +87,9 @@ const labelList = ref({
   7: "deliveryMaterialsFeeSummary",
   8: "packingLaborSummary",
   9: "managementFeeSummary",
-  10: "subtotal",
-  11: "total",
+  10: "proofingFeeSummary",
+  11: "subtotal",
+  12: "total",
 });
 const textList = ref({
   1: "胜德体育总经理:",

+ 12 - 5
src/views/group/finance/summary/printOrder.vue

@@ -91,6 +91,7 @@ watch(
                           deliveryMaterialsFeeSummary: res[i].skuSpecList[j].bomSpecList[y].deliveryMaterialsFeeSummary,
                           packingLaborSummary: res[i].skuSpecList[j].bomSpecList[y].packingLaborSummary,
                           managementFeeSummary: res[i].skuSpecList[j].bomSpecList[y].managementFeeSummary,
+                          proofingFeeSummary: res[i].skuSpecList[j].bomSpecList[y].proofingFeeSummary,
                           unitPriceSKU: res[i].skuSpecList[j].unitPrice,
                           total: res[i].total,
                           indexOne: indexOne,
@@ -251,27 +252,33 @@ const columns = computed(() => {
       width: 100,
     },
     {
-      dataKey: "unitPriceSKU",
+      dataKey: "proofingFeeSummary",
       key: "column-16",
+      title: "打样费",
+      width: 100,
+    },
+    {
+      dataKey: "unitPriceSKU",
+      key: "column-17",
       title: "SKU单价",
       width: 100,
     },
     {
       dataKey: "subtotal",
-      key: "column-17",
+      key: "column-18",
       title: "小计",
       width: 120,
     },
     {
       dataKey: "total",
-      key: "column-18",
+      key: "column-19",
       title: "合计",
       width: 120,
     },
   ];
 });
-const mergeColumnOne = [0, 1, 2, 18];
-const mergeColumnTwo = [3, 4, 5, 16, 17];
+const mergeColumnOne = [0, 1, 2, 19];
+const mergeColumnTwo = [3, 4, 5, 17, 18];
 const Row = ({ rowData, cells }) => {
   if (rowData.indexOne > 1) {
     for (let i = 0; i < mergeColumnOne.length; i++) {

+ 357 - 0
src/views/group/order/draw-design/index.vue

@@ -0,0 +1,357 @@
+<template>
+  <el-card class="box-card">
+    <byTable
+      :source="sourceList.data"
+      :pagination="sourceList.pagination"
+      :config="config"
+      :loading="loading"
+      :searchConfig="searchConfig"
+      highlight-current-row
+      :action-list="[
+        {
+          text: '快速登记打样',
+          action: () => clickModal(),
+        },
+      ]"
+      @get-list="getList"
+      @clickReset="clickReset">
+      <template #size="{ item }">
+        <div>{{ item.length }} * {{ item.width }} * {{ item.height }}</div>
+      </template>
+    </byTable>
+
+    <el-dialog title="快速登记打样" v-if="openDialog" v-model="openDialog" width="700">
+      <el-form :model="formData.data" label-width="120px" :rules="rules" ref="submit">
+        <el-form-item label="事业部:" prop="departmentId">
+          <el-select v-model="formData.data.departmentId" placeholder="请选择事业部" style="width: 100%">
+            <el-option v-for="item in departmentList" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="订单号:" prop="orderId">
+          <el-select-v2
+            v-model="formData.data.orderId"
+            :options="productionOrder"
+            placeholder="请选择订单号"
+            style="width: 100%"
+            filterable
+            remote
+            :loading="loadingSelect"
+            :remote-method="remoteMethod" />
+        </el-form-item>
+        <el-form-item label="尺寸(cm)" required>
+          <el-row>
+            <el-col :span="8">
+              <el-form-item label="" prop="length">
+                <el-select v-model="formData.data.length" placeholder="请选择长" style="width: 100%">
+                  <el-option label="183" :value="183" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="" prop="width">
+                <el-select v-model="formData.data.width" placeholder="请选择宽" style="width: 100%">
+                  <el-option label="61" :value="61" />
+                  <el-option label="68" :value="68" />
+                  <el-option label="80" :value="80" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item label="" prop="height">
+                <el-select v-model="formData.data.height" placeholder="请选择高" style="width: 100%">
+                  <el-option label="0.6" :value="0.6" />
+                  <el-option label="0.8" :value="0.8" />
+                  <el-option label="1.0" :value="1.0" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form-item>
+        <el-form-item label="是否新废垫:" prop="useNewBom">
+          <el-select v-model="formData.data.useNewBom" placeholder="请选择是否新废垫" style="width: 100%">
+            <el-option label="是" :value="1" />
+            <el-option label="否" :value="0" />
+          </el-select>
+        </el-form-item>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="定制加工类型:" prop="customProcessingType">
+              <el-select v-model="formData.data.customProcessingType" placeholder="请选择定制加工类型" style="width: 100%">
+                <el-option label="体位线" :value="10" />
+                <el-option label="logo" :value="20" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="加工次数:" prop="processingNum">
+              <el-input-number
+                onmousewheel="return false;"
+                v-model="formData.data.processingNum"
+                placeholder="加工次数"
+                style="width: 100%"
+                :controls="false"
+                :min="0"
+                :precision="0" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <template #footer>
+        <el-button @click="openDialog = false" size="large">取 消</el-button>
+        <el-button type="primary" @click="clickSubmit()" size="large" v-preReClick>确 定</el-button>
+      </template>
+    </el-dialog>
+  </el-card>
+</template>
+
+<script setup>
+import byTable from "/src/components/byTable/index";
+import { ElMessage } from "element-plus";
+
+const { proxy } = getCurrentInstance();
+const departmentList = ref([]);
+const sourceList = ref({
+  data: [],
+  pagination: {
+    pageNum: 1,
+    pageSize: 10,
+    total: 0,
+    orderCode: "",
+    departmentId: "",
+  },
+});
+const loading = ref(false);
+const searchConfig = computed(() => {
+  return [
+    {
+      type: "input",
+      prop: "orderCode",
+      label: "订单号",
+    },
+    {
+      type: "select",
+      prop: "departmentId",
+      data: departmentList.value,
+      label: "事业部",
+    },
+  ];
+});
+const config = computed(() => {
+  return [
+    {
+      attrs: {
+        label: "事业部",
+        prop: "departmentName",
+        width: 140,
+      },
+    },
+    {
+      attrs: {
+        label: "订单号",
+        prop: "orderCode",
+        "min-width": 160,
+      },
+    },
+    {
+      attrs: {
+        label: "废垫尺寸",
+        slot: "size",
+        width: 160,
+      },
+    },
+    {
+      attrs: {
+        label: "是否新废垫",
+        prop: "useNewBom",
+      },
+      render(val) {
+        if (val == 1) {
+          return "是";
+        }
+        return "否";
+      },
+    },
+    {
+      attrs: {
+        label: "打样类型",
+        prop: "customProcessingType",
+      },
+      render(val) {
+        if (val == 10) {
+          return "体位线";
+        }
+        return "logo";
+      },
+    },
+    {
+      attrs: {
+        label: "废垫费用",
+        prop: "unitPrice",
+      },
+    },
+    {
+      attrs: {
+        label: "加工次数",
+        prop: "processingNum",
+      },
+    },
+    {
+      attrs: {
+        label: "加工费用",
+        prop: "customProcessingFee",
+      },
+    },
+    {
+      attrs: {
+        label: "操作人",
+        prop: "operator",
+        width: 140,
+      },
+    },
+    {
+      attrs: {
+        label: "时间",
+        prop: "createTime",
+        width: 160,
+      },
+    },
+  ];
+});
+const getDemandData = () => {
+  proxy.post("/department/page", { pageNum: 1, pageSize: 999 }).then((res) => {
+    if (res.rows && res.rows.length > 0) {
+      departmentList.value = departmentList.value.concat(
+        res.rows.map((item) => {
+          return {
+            dictKey: item.id,
+            dictValue: item.name,
+          };
+        })
+      );
+    }
+  });
+};
+getDemandData();
+const getList = (req, status) => {
+  if (status) {
+    sourceList.value.pagination = {
+      pageNum: sourceList.value.pagination.pageNum,
+      pageSize: sourceList.value.pagination.pageSize,
+    };
+  } else {
+    sourceList.value.pagination = { ...sourceList.value.pagination, ...req };
+  }
+  loading.value = true;
+  proxy.post("/orderProofingRegistration/page", sourceList.value.pagination).then((res) => {
+    sourceList.value.data = res.rows;
+    sourceList.value.pagination.total = res.total;
+    setTimeout(() => {
+      loading.value = false;
+    }, 200);
+  });
+};
+getList();
+const clickReset = () => {
+  getList("", true);
+};
+const openDialog = ref(false);
+const formData = reactive({
+  data: {},
+});
+const rules = ref({
+  departmentId: [{ required: true, message: "请选择事业部", trigger: "change" }],
+  orderId: [{ required: true, message: "请选择订单", trigger: "change" }],
+  length: [{ required: true, message: "请选择长", trigger: "change" }],
+  width: [{ required: true, message: "请选择宽", trigger: "change" }],
+  height: [{ required: true, message: "请选择高", trigger: "change" }],
+  useNewBom: [{ required: true, message: "请选择是否新废垫", trigger: "change" }],
+  customProcessingType: [{ required: true, message: "请选择定制加工类型", trigger: "change" }],
+  processingNum: [{ required: true, message: "请输入加工次数", trigger: "blur" }],
+});
+const productionOrder = ref([]);
+const loadingSelect = ref(false);
+const remoteMethod = (query) => {
+  if (query !== "") {
+    loadingSelect.value = true;
+    proxy.post("/orderInfo/getOrderSelectList", { pageNum: 1, pageSize: 200, code: query }).then(
+      (res) => {
+        if (res.rows && res.rows.length > 0) {
+          productionOrder.value = res.rows.map((item) => {
+            if (item.wlnCode) {
+              return {
+                value: item.id,
+                label: item.code + " (" + item.wlnCode + ")",
+              };
+            } else {
+              return {
+                value: item.id,
+                label: item.code,
+              };
+            }
+          });
+        } else {
+          productionOrder.value = [];
+        }
+        loadingSelect.value = false;
+      },
+      (err) => {
+        console.log(err);
+        productionOrder.value = [];
+        loadingSelect.value = false;
+      }
+    );
+  } else {
+    productionOrder.value = [];
+  }
+};
+const clickModal = () => {
+  formData.data = {};
+  openDialog.value = true;
+};
+const priceList = ref({
+  61: {
+    0.6: 7.5,
+    0.8: 8.5,
+    1.0: 11.5,
+  },
+  68: {
+    0.6: 8,
+    0.8: 10,
+    1.0: 13,
+  },
+  80: {
+    0.6: 9,
+    0.8: 12,
+    1.0: 15,
+  },
+});
+const clickSubmit = () => {
+  proxy.$refs.submit.validate((valid) => {
+    if (valid) {
+      if (formData.data.useNewBom === 1) {
+        formData.data.unitPrice = priceList.value[formData.data.width][formData.data.height];
+      } else {
+        formData.data.unitPrice = 0;
+      }
+      let price = 0;
+      if (formData.data.customProcessingType == 10) {
+        price = 1.5;
+      } else {
+        price = 0.5;
+      }
+      formData.data.customProcessingFee = Number(Math.round(price * formData.data.processingNum * 100) / 100);
+      proxy.post("/orderProofingRegistration/add", formData.data).then(() => {
+        ElMessage({ message: "提交成功", type: "success" });
+        getList();
+        openDialog.value = false;
+      });
+    }
+  });
+};
+</script>
+
+<style lang="scss" scoped>
+::v-deep(.el-input-number .el-input__inner) {
+  text-align: left;
+}
+</style>

+ 22 - 0
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 {

+ 11 - 0
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,

+ 11 - 0
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,

+ 3 - 0
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";

+ 20 - 0
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");

+ 11 - 0
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,

+ 11 - 0
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,