Merge remote-tracking branch 'origin/dev_NEW_pro' into dev_NEW_pro

yuan

6 天以前 945e2e65de5edde82f831d77d5ce2ab76e73cb9a

Merge remote-tracking branch 'origin/dev_NEW_pro' into dev_NEW_pro

 multiple/assets/favicon/SDTXfavicon.ico

 multiple/assets/logo/SDTXLogo.png

 multiple/config.json

@@ -15,33 +15,6 @@
    "logo": "logo/Logo.png",
    "favicon": "favicon/favicon.ico"
  },
  "SDJC": {
    "env": {
      "VITE_APP_TITLE": "黎城县胜德建材有限公司",
      "VITE_BASE_API": "http://36.138.236.153:9000",
      "VITE_JAVA_API": "http://36.138.236.153:9001"
    },
    "logo": "logo/SDJCLogo.png",
    "favicon": "favicon/SDJCfavicon.ico"
  },
  "KS": {
    "env": {
      "VITE_APP_TITLE": "黎城康森商砼有限公司",
      "VITE_BASE_API": "http://36.138.236.176:9000",
      "VITE_JAVA_API": "http://36.138.236.176:9001"
    },
    "logo": "logo/KSLogo.png",
    "favicon": "favicon/KSfavicon.ico"
  },
  "DZZB": {
    "env": {
      "VITE_APP_TITLE": "山西丹朱装备制造股份有限公司",
      "VITE_BASE_API": "http://36.138.236.176:9000",
      "VITE_JAVA_API": "http://36.138.236.176:9001"
    },
    "logo": "logo/DZZBLogo.png",
    "favicon": "favicon/DZZBfavicon.ico"
  },
  "BTYX": {
    "env": {
      "VITE_APP_TITLE": "河南帮太优选食品有限公司",
@@ -60,41 +33,32 @@
    "logo": "logo/ZXZNLogo.png",
    "favicon": "favicon/ZXZNfavicon.ico"
  },
  "HYZC": {
  "SDTX": {
    "env": {
      "VITE_APP_TITLE": "山西华亿众成建材有限公司",
      "VITE_BASE_API": "http://36.137.13.103:9001",
      "VITE_JAVA_API": "http://36.137.13.103:9000"
      "VITE_APP_TITLE": "河南善鼎通信科技有限公司",
      "VITE_BASE_API": "http://36.213.156.184:9001",
      "VITE_JAVA_API": "http://36.213.156.184:9000"
    },
    "logo": "logo/HYZCLogo.png",
    "favicon": "favicon/HYZCfavicon.ico"
    "logo": "logo/SDTXLogo.png",
    "favicon": "favicon/SDTXfavicon.ico"
  },
  "WTXC": {
  "QXY": {
    "env": {
      "VITE_APP_TITLE": "宁夏万通新材",
      "VITE_BASE_API": "http://42.63.71.140:9001",
      "VITE_JAVA_API": "http://42.63.71.140:9000"
      "VITE_APP_TITLE": "强信宇电器管理系统",
      "VITE_BASE_API": "http://36.134.154.10:9001",
      "VITE_JAVA_API": "http://36.134.154.10:9000"
    },
    "logo": "logo/WTXCLogo.png",
    "favicon": "favicon/WTXCfavicon.ico"
    "logo": "logo/QXYLogo.png",
    "favicon": "favicon/QXYfavicon.ico"
  },
  "KYHG": {
  "XCDQ": {
    "env": {
      "VITE_APP_TITLE": "山西坤源化工有限公司",
      "VITE_BASE_API": "http://36.137.13.29:9001",
      "VITE_JAVA_API": "http://36.137.13.29:9000"
      "VITE_APP_TITLE": "旭晨电器管理系统",
      "VITE_BASE_API": "http://36.133.45.183:9001",
      "VITE_JAVA_API": "http://36.133.45.183:9002"
    },
    "logo": "logo/KYHGLogo.png",
    "favicon": "favicon/KYHGfavicon.ico"
  },
  "DYKJ": {
    "env": {
      "VITE_APP_TITLE": "山西德益科技有限公司",
      "VITE_BASE_API": "http://36.137.12.37:9001",
      "VITE_JAVA_API": "http://36.137.12.37:9000"
    },
    "logo": "logo/DYKJLogo.png",
    "favicon": "favicon/DYKJfavicon.ico"
    "logo": "logo/XCDQLogo.png",
    "favicon": "favicon/XCDQfavicon.ico"
  },
  "ZQSY": {
    "env": {
@@ -168,51 +132,6 @@
    "logo": "logo/XCDQLogo.png",
    "favicon": "favicon/XCDQfavicon.ico"
  },
  "YSJX": {
    "env": {
      "VITE_APP_TITLE": "宁夏玉山机械设备制造有限公司",
      "VITE_BASE_API": "http://36.133.45.183:9001",
      "VITE_JAVA_API": "http://36.133.45.183:9002"
    },
    "logo": "logo/YSJXLogo.png",
    "favicon": "favicon/YSJXico.ico"
  },
  "XLZB": {
    "env": {
      "VITE_APP_TITLE": "宁夏协力装备有限公司",
      "VITE_BASE_API": "http://36.133.45.183:9001",
      "VITE_JAVA_API": "http://36.133.45.183:9002"
    },
    "logo": "logo/XLZBLogo.png",
    "favicon": "favicon/XLZBico.ico"
  },
  "JXSM": {
    "env": {
      "VITE_APP_TITLE": "襄垣县洁鑫商贸有限公司",
      "VITE_BASE_API": "http://36.133.45.183:9001",
      "VITE_JAVA_API": "http://36.133.45.183:9002"
    },
    "logo": "logo/JXSMLogo.png",
    "favicon": "favicon/JXSMico.ico"
  },
  "JHHG": {
    "env": {
      "VITE_APP_TITLE": "宁夏九泓化工科技有限公司",
      "VITE_BASE_API": "http://42.63.70.90:9001",
      "VITE_JAVA_API": "http://42.63.70.90:9002"
    },
    "logo": "logo/JHHGLogo.png",
    "favicon": "favicon/JHHGfavicon.ico"
  },
  "LFJZ": {
    "env": {
      "VITE_APP_TITLE": "力发建筑装饰有限公司",
      "VITE_BASE_API": "http://36.212.201.241:9001",
      "VITE_JAVA_API": "http://36.212.201.241:9000"
    },
    "logo": "logo/LFJZLogo.png",
    "favicon": "favicon/LFJZfavicon.ico"
  },
  "logo": "/src/assets/logo/logo.png",
  "favicon": "/public/favicon.ico"
}
}

 src/views/collaborativeApproval/purchaseApproval/index.vue

@@ -654,14 +654,10 @@
      return;
    }
    if (operationType.value === "add") {
      productSelectedRows.value.forEach(selectedRow => {
        const index = productData.value.findIndex(
          product => product.id === selectedRow.id
        );
        if (index !== -1) {
          productData.value.splice(index, 1);
        }
      });
      productData.value = productData.value.filter(
        item => !productSelectedRows.value.includes(item)
      );
      productSelectedRows.value = [];
    } else {
      let ids = [];
      if (productSelectedRows.value.length > 0) {

 src/views/equipmentManagement/measurementEquipment/filesDia.vue

@@ -1,38 +1,16 @@
<template>
  <div>
    <el-dialog
        v-model="dialogFormVisible"
        title="上传附件"
        width="50%"
        @close="closeDia"
    >
    <el-dialog v-model="dialogFormVisible" title="上传附件" width="50%" @close="closeDia">
      <div style="margin-bottom: 10px;text-align: right">
        <el-upload
            v-model:file-list="fileList"
            class="upload-demo"
            :action="uploadUrl"
            :on-success="handleUploadSuccess"
            :on-error="handleUploadError"
            name="files"
            :show-file-list="false"
            :headers="headers"
            style="display: inline;margin-right: 10px"
        >
        <el-upload v-model:file-list="fileList" class="upload-demo" :action="uploadUrl"
          :on-success="handleUploadSuccess" :on-error="handleUploadError" name="files" :show-file-list="false"
          :headers="headers" style="display: inline;margin-right: 10px">
          <el-button type="primary">上传附件</el-button>
        </el-upload>
        <el-button type="danger" plain @click="handleDelete">删除</el-button>
      </div>
      <PIMTable
          rowKey="id"
          :column="tableColumn"
          :tableData="tableData"
          :page="page"
          :tableLoading="tableLoading"
          :isSelection="true"
          @selection-change="handleSelectionChange"
          @pagination="paginationSearch"
          height="500"
      >
      <PIMTable rowKey="id" :column="tableColumn" :tableData="tableData" :page="page" :tableLoading="tableLoading"
        :isSelection="true" @selection-change="handleSelectionChange" @pagination="paginationSearch" height="500">
      </PIMTable>
      <template #footer>
        <div class="dialog-footer">
@@ -45,9 +23,9 @@
</template>

<script setup>
import {ref, reactive, getCurrentInstance} from "vue";
import {ElMessageBox} from "element-plus";
import {getToken} from "@/utils/auth.js";
import { ref, reactive, getCurrentInstance } from "vue";
import { ElMessageBox } from "element-plus";
import { getToken } from "@/utils/auth.js";
import filePreview from '@/components/filePreview/index.vue'
import PIMTable from "@/components/PIMTable/PIMTable.vue";
import {
@@ -90,9 +68,9 @@
  },
]);
const page = reactive({
    current: 1,
    size: 100,
    total: 0,
  current: 1,
  size: 100,
  total: 0,
});
const tableData = ref([]);
const fileList = ref([]);
@@ -104,22 +82,22 @@
const uploadUrl = ref(import.meta.env.VITE_APP_BASE_API + "/common/upload"); // 上传的服务器地址

// 打开弹框
const openDialog = (row,type) => {
const openDialog = (row, type) => {
  accountType.value = type;
  dialogFormVisible.value = true;
  currentId.value = row.id;
  getList()
}
const paginationSearch = (obj) => {
    page.current = obj.page;
    page.size = obj.limit;
    // 前端分页暂不处理，直接调用获取全量列表
    getList();
  page.current = obj.page;
  page.size = obj.limit;
  // 前端分页暂不处理，直接调用获取全量列表
  getList();
};
const getList = () => {
  getStorageAttachmentList({recordId: currentId.value, recordType: accountType.value}).then(res => {
  getStorageAttachmentList({ recordId: currentId.value, recordType: accountType.value }).then(res => {
    tableData.value = res.data;
        page.total = res.data ? res.data.length : 0;
    page.total = res.data ? res.data.length : 0;
  })
}
// 表格选择数据
@@ -136,7 +114,11 @@
function handleUploadSuccess(res, file) {
  // 如果上传成功
  if (res.code == 200 && res.data && res.data.length > 0) {
    const mergedFiles = [...tableData.value, ...res.data];
    const newFiles = res.data.map(item => ({
      ...item,
      name: item.originalFilename || item.name
    }));
    const mergedFiles = [...(tableData.value || []), ...newFiles];
    const storageAttachmentDTO = {
      recordType: accountType.value,
      recordId: currentId.value,
@@ -157,7 +139,7 @@
}
// 下载附件
const downLoadFile = (row) => {
    proxy.$download.byUrl(row.url, row.originalFilename);
  proxy.$download.byUrl(row.url, row.originalFilename);
}
// 删除
const handleDelete = () => {
@@ -191,6 +173,4 @@
});
</script>

<style scoped>

</style>
<style scoped></style>

 src/views/procurementManagement/procurementLedger/index.vue

@@ -1640,14 +1640,10 @@
      return;
    }
    if (operationType.value === "add") {
      productSelectedRows.value.forEach(selectedRow => {
        const index = productData.value.findIndex(
          product => product.id === selectedRow.id
        );
        if (index !== -1) {
          productData.value.splice(index, 1);
        }
      });
      productData.value = productData.value.filter(
        item => !productSelectedRows.value.includes(item)
      );
      productSelectedRows.value = [];
    } else {
      let ids = [];
      if (productSelectedRows.value.length > 0) {

 src/views/salesManagement/salesLedger/index.vue

@@ -285,13 +285,13 @@
            <el-form-item label="销售合同号："
                          prop="salesContractNo">
              <div style="display: flex; align-items: center; gap: 12px;width: 100%;">
                <el-checkbox v-model="form.autoGenerateContractNo" v-if="operationType === 'add'">自动生成
                <el-checkbox v-model="form.autoGenerateContractNo"
                             v-if="operationType === 'add'">自动生成
                </el-checkbox>
                <el-input v-model="form.salesContractNo"
                          :placeholder="form.autoGenerateContractNo ? '自动生成' : '请输入'"
                          clearable
                          :disabled="form.autoGenerateContractNo" />

              </div>
            </el-form-item>
          </el-col>
@@ -920,7 +920,8 @@
          </el-col>
        </el-row>
        <el-row :gutter="30">
          <el-col :span="24" v-if="deliveryForm.type === '货车'">
          <el-col :span="24"
                  v-if="deliveryForm.type === '货车'">
            <el-form-item label="发货车牌号："
                          prop="shippingCarNumber">
              <el-input v-model="deliveryForm.shippingCarNumber"
@@ -928,7 +929,8 @@
                        clearable />
            </el-form-item>
          </el-col>
          <el-col :span="24" v-else>
          <el-col :span="24"
                  v-else>
            <el-form-item label="快递公司："
                          prop="expressCompany">
              <el-input v-model="deliveryForm.expressCompany"
@@ -937,7 +939,8 @@
            </el-form-item>
          </el-col>
        </el-row>
        <el-row :gutter="30" v-if="deliveryForm.type === '快递'">
        <el-row :gutter="30"
                v-if="deliveryForm.type === '快递'">
          <el-col :span="24">
            <el-form-item label="快递单号："
                          prop="expressNumber">
@@ -950,7 +953,8 @@
        <el-row :gutter="30">
          <el-col :span="24">
            <el-form-item label="发货图片：">
              <ImageUpload v-model:file-list="deliveryFileList" :limit="9" />
              <ImageUpload v-model:file-list="deliveryFileList"
                           :limit="9" />
            </el-form-item>
          </el-col>
        </el-row>
@@ -1271,7 +1275,9 @@
      shippingCarNumber: [
        { validator: validateDeliveryShippingCarNumber, trigger: "blur" },
      ],
      expressCompany: [{ validator: validateDeliveryExpressCompany, trigger: "blur" }],
      expressCompany: [
        { validator: validateDeliveryExpressCompany, trigger: "blur" },
      ],
      type: [{ required: true, message: "请选择发货类型", trigger: "change" }],
    },
  });
@@ -1725,7 +1731,7 @@
        invoiceType: "增普票",
        isProduction: true,
        productId: p.productId,
        productModelId: p.productModelId
        productModelId: p.productModelId,
      };
    });

@@ -1750,7 +1756,7 @@
        form.value.storageBlobDTOs = fileList;
        form.value.type = 1;
        if (form.value.autoGenerateContractNo) {
          form.value.salesContractNo = '';
          form.value.salesContractNo = "";
        }
        addOrUpdateSalesLedger(form.value).then(res => {
          proxy.$modal.msgSuccess("提交成功");
@@ -1860,14 +1866,10 @@
    }

    if (operationType.value === "add") {
      productSelectedRows.value.forEach(selectedRow => {
        const index = productData.value.findIndex(
          product => product.id === selectedRow.id
        );
        if (index !== -1) {
          productData.value.splice(index, 1);
        }
      });
      productData.value = productData.value.filter(
        item => !productSelectedRows.value.includes(item)
      );
      productSelectedRows.value = [];
    } else {
      let ids = [];
      if (productSelectedRows.value.length > 0) {
@@ -2069,286 +2071,286 @@

    // 构建打印内容
    let printContent = `
                                                                <!DOCTYPE html>
                                                                <html>
                                                                <head>
                                                                  <meta charset="UTF-8">
                                                                  <title>打印预览</title>
                                                                  <style>
                                                                    body {
                                                                      margin: 0;
                                                                      padding: 0;
                                                                      font-family: "SimSun", serif;
                                                                      background: white;
                                                                    }
                                                                                                                 .print-page {
                                                                        width: 200mm;
                                                                        height: 75mm;
                                                                        padding: 10mm;
                                                                        padding-left: 20mm;
                                                                        background: white;
                                                                        box-sizing: border-box;
                                                                        page-break-after: always;
                                                                        page-break-inside: avoid;
                                                                      }
                                                                     .print-page:last-child {
                                                                       page-break-after: avoid;
                                                                     }
                                                                    .delivery-note {
                                                                      width: 100%;
                                                                      height: 100%;
                                                                      font-size: 12px;
                                                                      line-height: 1.2;
                                                                      display: flex;
                                                                      flex-direction: column;
                                                                      color: #000;
                                                                    }
                                                                    .header {
                                                                      text-align: center;
                                                                      margin-bottom: 8px;
                                                                    }
                                                                    .company-name {
                                                                      font-size: 18px;
                                                                      font-weight: bold;
                                                                      margin-bottom: 4px;
                                                                    }
                                                                    .document-title {
                                                                      font-size: 16px;
                                                                      font-weight: bold;
                                                                    }
                                                                    .info-section {
                                                                      margin-bottom: 8px;
                                                                      display: flex;
                                                                      justify-content: space-between;
                                                                      align-items: center;
                                                                    }
                                                                    .info-row {
                                                                      line-height: 20px;
                                                                    }
                                                                    .label {
                                                                      font-weight: bold;
                                                                      width: 60px;
                                                                      font-size: 12px;
                                                                    }
                                                                    .value {
                                                                      margin-right: 20px;
                                                                      min-width: 80px;
                                                                      font-size: 12px;
                                                                    }
                                                                             .table-section {
                                                                             margin-bottom: 40px;
                                                                      //  flex: 0.6;
                                                                     }
                                                                    .product-table {
                                                                      width: 100%;
                                                                      border-collapse: collapse;
                                                                      border: 1px solid #000;
                                                                    }
                                                                             .product-table th, .product-table td {
                                                                       border: 1px solid #000;
                                                                       padding: 6px;
                                                                       text-align: center;
                                                                       font-size: 12px;
                                                                       line-height: 1.4;
                                                                     }
                                                                    .product-table th {
                                                                      font-weight: bold;
                                                                    }
                                                                    .total-value {
                                                                      font-weight: bold;
                                                                    }
                                                                    .footer-section {
                                                                      margin-top: auto;
                                                                    }
                                                                    .footer-row {
                                                                      display: flex;
                                                                      margin-bottom: 3px;
                                                                      line-height: 22px;
                                                                      justify-content: space-between;
                                                                    }
                                                                    .footer-item {
                                                                      display: flex;
                                                                      margin-right: 20px;
                                                                    }
                                                                    .footer-item .label {
                                                                      font-weight: bold;
                                                                      width: 80px;
                                                                      font-size: 12px;
                                                                    }
                                                                    .footer-item .value {
                                                                      min-width: 80px;
                                                                      font-size: 12px;
                                                                    }
                                                                    .address-item .address-value {
                                                                      min-width: 200px;
                                                                    }
                                                                    @media print {
                                                                  <!DOCTYPE html>
                                                                  <html>
                                                                  <head>
                                                                    <meta charset="UTF-8">
                                                                    <title>打印预览</title>
                                                                    <style>
                                                                      body {
                                                                        margin: 0;
                                                                        padding: 0;
                                                                        font-family: "SimSun", serif;
                                                                        background: white;
                                                                      }
                                                                                 .print-page {
                                                                         margin: 0;
                                                                         padding: 10mm;
                                                                         /* padding-left: 20mm; */
                                                                         page-break-inside: avoid;
                                                                         page-break-after: always;
                                                                       }
                                                                                                                   .print-page {
                                                                          width: 200mm;
                                                                          height: 75mm;
                                                                          padding: 10mm;
                                                                          padding-left: 20mm;
                                                                          background: white;
                                                                          box-sizing: border-box;
                                                                          page-break-after: always;
                                                                          page-break-inside: avoid;
                                                                        }
                                                                       .print-page:last-child {
                                                                         page-break-after: avoid;
                                                                       }
                                                                    }
                                                                  </style>
                                                                </head>
                                                                <body>
                                                              `;
                                                                      .delivery-note {
                                                                        width: 100%;
                                                                        height: 100%;
                                                                        font-size: 12px;
                                                                        line-height: 1.2;
                                                                        display: flex;
                                                                        flex-direction: column;
                                                                        color: #000;
                                                                      }
                                                                      .header {
                                                                        text-align: center;
                                                                        margin-bottom: 8px;
                                                                      }
                                                                      .company-name {
                                                                        font-size: 18px;
                                                                        font-weight: bold;
                                                                        margin-bottom: 4px;
                                                                      }
                                                                      .document-title {
                                                                        font-size: 16px;
                                                                        font-weight: bold;
                                                                      }
                                                                      .info-section {
                                                                        margin-bottom: 8px;
                                                                        display: flex;
                                                                        justify-content: space-between;
                                                                        align-items: center;
                                                                      }
                                                                      .info-row {
                                                                        line-height: 20px;
                                                                      }
                                                                      .label {
                                                                        font-weight: bold;
                                                                        width: 60px;
                                                                        font-size: 12px;
                                                                      }
                                                                      .value {
                                                                        margin-right: 20px;
                                                                        min-width: 80px;
                                                                        font-size: 12px;
                                                                      }
                                                                               .table-section {
                                                                               margin-bottom: 40px;
                                                                        //  flex: 0.6;
                                                                       }
                                                                      .product-table {
                                                                        width: 100%;
                                                                        border-collapse: collapse;
                                                                        border: 1px solid #000;
                                                                      }
                                                                               .product-table th, .product-table td {
                                                                         border: 1px solid #000;
                                                                         padding: 6px;
                                                                         text-align: center;
                                                                         font-size: 12px;
                                                                         line-height: 1.4;
                                                                       }
                                                                      .product-table th {
                                                                        font-weight: bold;
                                                                      }
                                                                      .total-value {
                                                                        font-weight: bold;
                                                                      }
                                                                      .footer-section {
                                                                        margin-top: auto;
                                                                      }
                                                                      .footer-row {
                                                                        display: flex;
                                                                        margin-bottom: 3px;
                                                                        line-height: 22px;
                                                                        justify-content: space-between;
                                                                      }
                                                                      .footer-item {
                                                                        display: flex;
                                                                        margin-right: 20px;
                                                                      }
                                                                      .footer-item .label {
                                                                        font-weight: bold;
                                                                        width: 80px;
                                                                        font-size: 12px;
                                                                      }
                                                                      .footer-item .value {
                                                                        min-width: 80px;
                                                                        font-size: 12px;
                                                                      }
                                                                      .address-item .address-value {
                                                                        min-width: 200px;
                                                                      }
                                                                      @media print {
                                                                        body {
                                                                          margin: 0;
                                                                          padding: 0;
                                                                        }
                                                                                   .print-page {
                                                                           margin: 0;
                                                                           padding: 10mm;
                                                                           /* padding-left: 20mm; */
                                                                           page-break-inside: avoid;
                                                                           page-break-after: always;
                                                                         }
                                                                         .print-page:last-child {
                                                                           page-break-after: avoid;
                                                                         }
                                                                      }
                                                                    </style>
                                                                  </head>
                                                                  <body>
                                                                `;

    // 为每条数据生成打印页面
    printData.value.forEach((item, index) => {
      printContent += `
                                                                  <div class="print-page">
                                                                    <div class="delivery-note">
                                                                      <div class="header">
                                                                        <div class="document-title">零售发货单</div>
                                                                      </div>
                                                                      
                                                                      <div class="info-section">
                                                                        <div class="info-row">
                                                                          <div>
                                                                            <span class="label">发货日期：</span>
                                                                            <span class="value">${formatDate(
                                                                              item.createTime
                                                                            )}</span>
                                                                    <div class="print-page">
                                                                      <div class="delivery-note">
                                                                        <div class="header">
                                                                          <div class="document-title">零售发货单</div>
                                                                        </div>
                                                                        
                                                                        <div class="info-section">
                                                                          <div class="info-row">
                                                                            <div>
                                                                              <span class="label">发货日期：</span>
                                                                              <span class="value">${formatDate(
                                                                                item.createTime
                                                                              )}</span>
                                                                            </div>
                                                                            <div>
                                                                              <span class="label">客户名称：</span>
                                                                              <span class="value">${
                                                                                item.customerName
                                                                              }</span>
                                                                            </div>
                                                                          </div>
                                                                          <div>
                                                                            <span class="label">客户名称：</span>
                                                                          <div class="info-row">
                                                                            <span class="label">单号：</span>
                                                                            <span class="value">${
                                                                              item.customerName
                                                                              item.salesContractNo ||
                                                                              ""
                                                                            }</span>
                                                                          </div>
                                                                        </div>
                                                                        <div class="info-row">
                                                                          <span class="label">单号：</span>
                                                                          <span class="value">${
                                                                            item.salesContractNo ||
                                                                            ""
                                                                          }</span>
                                                                        </div>
                                                                      </div>

                                                                      <div class="table-section">
                                                                        <table class="product-table">
                                                                          <thead>
                                                                            <tr>
                                                                              <th>产品名称</th>
                                                                              <th>规格型号</th>
                                                                              <th>单位</th>
                                                                              <th>单价</th>
                                                                              <th>零售数量</th>
                                                                              <th>零售金额</th>
                                                                            </tr>
                                                                          </thead>
                                                                          <tbody>
                                                                            ${
                                                                              item.products &&
                                                                              item
                                                                                .products
                                                                                .length >
                                                                                0
                                                                                ? item.products
                                                                                    .map(
                                                                                      product => `
                                                                                <tr>
                                                                                  <td>${
                                                                                    product.productCategory ||
                                                                                    ""
                                                                                  }</td>
                                                                                  <td>${
                                                                                    product.specificationModel ||
                                                                                    ""
                                                                                  }</td>
                                                                                  <td>${
                                                                                    product.unit ||
                                                                                    ""
                                                                                  }</td>
                                                                                  <td>${
                                                                                    product.taxInclusiveUnitPrice ||
                                                                                    "0"
                                                                                  }</td>
                                                                                  <td>${
                                                                                    product.quantity ||
                                                                                    "0"
                                                                                  }</td>
                                                                                  <td>${
                                                                                    product.taxInclusiveTotalPrice ||
                                                                                    "0"
                                                                                  }</td>
                                                                                </tr>
                                                                              `
                                                                                    )
                                                                                    .join(
                                                                        <div class="table-section">
                                                                          <table class="product-table">
                                                                            <thead>
                                                                              <tr>
                                                                                <th>产品名称</th>
                                                                                <th>规格型号</th>
                                                                                <th>单位</th>
                                                                                <th>单价</th>
                                                                                <th>零售数量</th>
                                                                                <th>零售金额</th>
                                                                              </tr>
                                                                            </thead>
                                                                            <tbody>
                                                                              ${
                                                                                item.products &&
                                                                                item
                                                                                  .products
                                                                                  .length >
                                                                                  0
                                                                                  ? item.products
                                                                                      .map(
                                                                                        product => `
                                                                                  <tr>
                                                                                    <td>${
                                                                                      product.productCategory ||
                                                                                      ""
                                                                                    )
                                                                                : '<tr><td colspan="6" style="text-align: center; color: #999;">暂无产品数据</td></tr>'
                                                                            }
                                                                          </tbody>
                                                                          <tfoot>
                                                                            <tr>
                                                                              <td class="label">合计</td>
                                                                              <td class="total-value"></td>
                                                                              <td class="total-value"></td>
                                                                              <td class="total-value"></td>
                                                                              <td class="total-value">${getTotalQuantityForPrint(
                                                                                item.products
                                                                              )}</td>
                                                                              <td class="total-value">${getTotalAmountForPrint(
                                                                                item.products
                                                                              )}</td>
                                                                            </tr>
                                                                          </tfoot>
                                                                        </table>
                                                                      </div>

                                                                      <div class="footer-section">
                                                                        <div class="footer-row">
                                                                          <div class="footer-item">
                                                                            <span class="label">收货电话：</span>
                                                                            <span class="value"></span>
                                                                          </div>
                                                                          <div class="footer-item">
                                                                            <span class="label">收货人：</span>
                                                                            <span class="value"></span>
                                                                          </div>
                                                                          <div class="footer-item address-item">
                                                                            <span class="label">收货地址：</span>
                                                                            <span class="value address-value"></span>
                                                                          </div>
                                                                                    }</td>
                                                                                    <td>${
                                                                                      product.specificationModel ||
                                                                                      ""
                                                                                    }</td>
                                                                                    <td>${
                                                                                      product.unit ||
                                                                                      ""
                                                                                    }</td>
                                                                                    <td>${
                                                                                      product.taxInclusiveUnitPrice ||
                                                                                      "0"
                                                                                    }</td>
                                                                                    <td>${
                                                                                      product.quantity ||
                                                                                      "0"
                                                                                    }</td>
                                                                                    <td>${
                                                                                      product.taxInclusiveTotalPrice ||
                                                                                      "0"
                                                                                    }</td>
                                                                                  </tr>
                                                                                `
                                                                                      )
                                                                                      .join(
                                                                                        ""
                                                                                      )
                                                                                  : '<tr><td colspan="6" style="text-align: center; color: #999;">暂无产品数据</td></tr>'
                                                                              }
                                                                            </tbody>
                                                                            <tfoot>
                                                                              <tr>
                                                                                <td class="label">合计</td>
                                                                                <td class="total-value"></td>
                                                                                <td class="total-value"></td>
                                                                                <td class="total-value"></td>
                                                                                <td class="total-value">${getTotalQuantityForPrint(
                                                                                  item.products
                                                                                )}</td>
                                                                                <td class="total-value">${getTotalAmountForPrint(
                                                                                  item.products
                                                                                )}</td>
                                                                              </tr>
                                                                            </tfoot>
                                                                          </table>
                                                                        </div>
                                                                        <div class="footer-row">
                                                                          <div class="footer-item">
                                                                            <span class="label">操作员：</span>
                                                                            <span class="value">${
                                                                              userStore.nickName ||
                                                                              "撕开前"
                                                                            }</span>

                                                                        <div class="footer-section">
                                                                          <div class="footer-row">
                                                                            <div class="footer-item">
                                                                              <span class="label">收货电话：</span>
                                                                              <span class="value"></span>
                                                                            </div>
                                                                            <div class="footer-item">
                                                                              <span class="label">收货人：</span>
                                                                              <span class="value"></span>
                                                                            </div>
                                                                            <div class="footer-item address-item">
                                                                              <span class="label">收货地址：</span>
                                                                              <span class="value address-value"></span>
                                                                            </div>
                                                                          </div>
                                                                          <div class="footer-item">
                                                                            <span class="label">打印日期：</span>
                                                                            <span class="value">${formatDateTime(
                                                                              new Date()
                                                                            )}</span>
                                                                          <div class="footer-row">
                                                                            <div class="footer-item">
                                                                              <span class="label">操作员：</span>
                                                                              <span class="value">${
                                                                                userStore.nickName ||
                                                                                "撕开前"
                                                                              }</span>
                                                                            </div>
                                                                            <div class="footer-item">
                                                                              <span class="label">打印日期：</span>
                                                                              <span class="value">${formatDateTime(
                                                                                new Date()
                                                                              )}</span>
                                                                            </div>
                                                                          </div>
                                                                        </div>
                                                                      </div>
                                                                    </div>
                                                                  </div>
                                                                `;
                                                                  `;
    });

    printContent += `
                                                                </body>
                                                                </html>
                                                              `;
                                                                  </body>
                                                                  </html>
                                                                `;

    // 写入内容到新窗口
    printWindow.document.write(printContent);
@@ -2676,7 +2678,11 @@

    // 发货状态必须是"待发货"或"审核拒绝"
    const statusStr = shippingStatus ? String(shippingStatus).trim() : "";
    return statusStr === "待发货" || statusStr === "审核拒绝" || statusStr === "部分发货";
    return (
      statusStr === "待发货" ||
      statusStr === "审核拒绝" ||
      statusStr === "部分发货"
    );
  };

  // 打开附件弹窗