合并冲突

spring

4 天以前 4ca2aeafbb3c753d98ba849fa5ebf817049b5803

 src/views/inventoryManagement/dispatchLog/index.vue

@@ -4,7 +4,7 @@
      <div>
        <span class="search_title">供应商名称：</span>
        <el-input
          v-model="searchForm.customerName"
          v-model="searchForm.supplierName"
          style="width: 240px"
          placeholder="请输入"
          @change="handleQuery"
@@ -38,67 +38,67 @@
        <el-table-column align="center" label="序号" type="index" width="60" />
        <el-table-column
          label="出库日期"
          prop="salesContractNo"
          width="100"
          prop="createTime"
          min-width="130"
          show-overflow-tooltip
        />
        <el-table-column
          label="供应商名称"
          prop="customerName"
          width="160"
          prop="supplierName"
          width="250"
          show-overflow-tooltip
        />
        <el-table-column
          label="产品大类"
          prop="salesman"
          prop="productCategory"
          width="100"
          show-overflow-tooltip
        />
        <el-table-column
          label="规格型号"
          prop="projectName"
          prop="specificationModel"
          width="100"
          show-overflow-tooltip
        />
        <el-table-column
          label="单位"
          prop="contractAmount"
          prop="unit"
          width="80"
          show-overflow-tooltip
        />
        <el-table-column
          label="出库数量"
          prop="entryPersonName"
          prop="inboundNum"
          width="100"
          show-overflow-tooltip
        />
        <el-table-column
          label="含税单价(元)"
          prop="entryDate"
          width="100"
          prop="taxInclusiveUnitPrice"
          width="200"
          show-overflow-tooltip
        />
        <el-table-column
          label="含税总价(元)"
          prop="executionDate"
          width="100"
          prop="taxInclusiveTotalPrice"
          width="200"
          show-overflow-tooltip
        />
        <el-table-column
          label="税率(%)"
          prop="executionDate"
          prop="taxRate"
          width="100"
          show-overflow-tooltip
        />
        <el-table-column
          label="不含税总价(元)"
          prop="executionDate"
          prop="taxExclusiveTotalPrice"
          width="180"
          show-overflow-tooltip
        />
        <el-table-column
          label="出库人"
          prop="executionDate"
          prop="createBy"
          width="80"
          show-overflow-tooltip
        />
@@ -128,6 +128,120 @@
        @pagination="paginationChange"
      />
    </div>

    <!-- 打印预览弹窗 -->
    <el-dialog
      v-model="printPreviewVisible"
      title="打印预览"
      width="90%"
      :close-on-click-modal="false"
      class="print-preview-dialog"
    >
      <div class="print-preview-container">
                 <div class="print-preview-header">
           <el-button type="primary" @click="executePrint">执行打印</el-button>
           <el-button @click="printPreviewVisible = false">关闭预览</el-button>
         </div>
                   <div class="print-preview-content">
          <div v-if="printData.length === 0" style="text-align: center; padding: 50px; color: #999;">
            暂无打印数据
          </div>
          <div v-else style="text-align: center; padding: 10px; color: #666; font-size: 14px; background: #e8f4fd; margin-bottom: 10px;">
            共 {{ printData.length }} 条数据待打印
          </div>
          <div v-for="(item, index) in printData" :key="index" class="print-page">
            <div class="delivery-note">
              <div class="header">
                <div class="company-name">鼎诚瑞实业有限责任公司</div>
                <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.supplierName || '张爱有' }}</span>
                   </div>
                </div>
                <div class="info-row">
                  <span class="label">单号：</span>
                  <span class="value">{{ item.code }}</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>
                    <tr>
                      <td>{{ item.productCategory || '砂灰砖' }}</td>
                      <td>{{ item.specificationModel || '标准' }}</td>
                      <td>{{ item.unit || '块' }}</td>
                      <td>{{ item.taxInclusiveUnitPrice || '0' }}</td>
                      <td>{{ item.inboundNum || '2000' }}</td>
                      <td>{{ item.taxInclusiveTotalPrice || '0' }}</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">{{ item.inboundNum || '2000' }}</td>
                       <td class="total-value">{{ item.taxInclusiveTotalPrice || '0' }}</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>
                </div>
                <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>
      </div>
    </el-dialog>


  </div>
</template>

@@ -136,35 +250,49 @@
import { ref } from "vue";
import { ElMessageBox } from "element-plus";
import useUserStore from "@/store/modules/user";
import { userListNoPage } from "@/api/system/user.js";
import {
  ledgerListPage,
  customerList,
  addOrUpdateSalesLedger,
  getSalesLedgerWithProducts,
  delLedger,
} from "@/api/salesManagement/salesLedger.js";
  getStockOutPage,
  delStockOut,
} from "@/api/inventoryManagement/stockOut.js";

const userStore = useUserStore();
const { proxy } = getCurrentInstance();
const tableData = ref([]);
const productData = ref([]);
const selectedRows = ref([]);
const userList = ref([]);
const customerOption = ref([]);
const tableLoading = ref(false);
const page = reactive({
  current: 1,
  size: 100,
});
const total = ref(0);
const fileList = ref([]);

// 打印相关
const printPreviewVisible = ref(false);
const printData = ref([]);

// 用户信息表单弹框数据
const operationType = ref("");
const dialogFormVisible = ref(false);
const data = reactive({
  searchForm: {
    customerName: "",
    supplierName: "",
  },
  form: {
    supplierId: null,
    supplierName: '',
    productId: null,
    productName: '',
    userId: userStore.userId,
    nickname: '',
    model: '',
    productModelId: null,
    unit: '',
    productrecordId: null,
    taxInclusiveUnitPrice: '',
    taxInclusiveTotalPrice: '',
    taxRate: '',
    taxExclusiveTotalPrice: '',
    inboundTime: '',
    inboundBatch: '',
    inboundQuantity: ''
  },
});
const { searchForm } = toRefs(data);
@@ -182,23 +310,24 @@
};
const getList = () => {
  tableLoading.value = true;
  ledgerListPage({ ...searchForm.value, ...page })
  getStockOutPage({ ...searchForm.value, ...page })
    .then((res) => {
      tableLoading.value = false;
      tableData.value = res.records;
      tableData.value = res.data.records;
      tableData.value.map((item) => {
        item.children = [];
      });
      total.value = res.total;
      total.value = res.data.total;
    })
    .catch(() => {
      tableLoading.value = false;
    });
};

// 表格选择数据
const handleSelectionChange = (selection) => {
  // 过滤掉子数据
  selectedRows.value = selection.filter((item) => item.children !== undefined);
  selectedRows.value = selection.filter((item) => item.id);
  console.log("selection", selectedRows.value);
};
const expandedRowKeys = ref([]);
@@ -214,18 +343,19 @@

// 导出
const handleOut = () => {
  ElMessageBox.confirm("选中的内容将被导出，是否确认导出？", "导出", {
  ElMessageBox.confirm("是否确认导出？", "导出", {
    confirmButtonText: "确认",
    cancelButtonText: "取消",
    type: "warning",
  })
    .then(() => {
      proxy.download("/sales/ledger/export", {}, "出库台账.xlsx");
      proxy.download("/stockmanagement/export", {}, "出库台账.xlsx");
    })
    .catch(() => {
      proxy.$modal.msg("已取消");
    });
};

// 删除
const handleDelete = () => {
  let ids = [];
@@ -241,7 +371,7 @@
    type: "warning",
  })
    .then(() => {
      delLedger(ids).then((res) => {
      delStockOut({ids:ids}).then((res) => {
        proxy.$modal.msgSuccess("删除成功");
        getList();
      });
@@ -249,6 +379,296 @@
    .catch(() => {
      proxy.$modal.msg("已取消");
    });
};

// 打印功能
const handlePrint = () => {
  if (selectedRows.value.length === 0) {
    proxy.$modal.msgWarning("请选择要打印的数据");
    return;
  }
  printData.value = [...selectedRows.value];
  console.log('打印数据:', printData.value);
  printPreviewVisible.value = true;
};

// 执行打印
const executePrint = () => {
  console.log('开始执行打印，数据条数:', printData.value.length);
  console.log('打印数据:', printData.value);
  
  // 创建一个新的打印窗口
  const printWindow = window.open('', '_blank', 'width=800,height=600');
  
  // 构建打印内容
  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 {
          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="company-name">鼎诚瑞实业有限责任公司</div>
            <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.supplierName || '张爱有'}</span>
              </div>
            </div>
            <div class="info-row">
              <span class="label">单号：</span>
              <span class="value">${item.code || ''}</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>
                <tr>
                  <td>${item.productCategory || '砂灰砖'}</td>
                  <td>${item.specificationModel || '标准'}</td>
                  <td>${item.unit || '块'}</td>
                  <td>${item.taxInclusiveUnitPrice || '0'}</td>
                  <td>${item.inboundNum || '2000'}</td>
                  <td>${item.taxInclusiveTotalPrice || '0'}</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">${item.inboundNum || '2000'}</td>
                  <td class="total-value">${item.taxInclusiveTotalPrice || '0'}</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>
            </div>
            <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>
    `;
  });
  
  printContent += `
    </body>
    </html>
  `;
  
  // 写入内容到新窗口
  printWindow.document.write(printContent);
  printWindow.document.close();
  
  // 等待内容加载完成后打印
  printWindow.onload = () => {
    setTimeout(() => {
      printWindow.print();
      printWindow.close();
      printPreviewVisible.value = false;
    }, 500);
  };
};



// 格式化日期
const formatDate = (dateString) => {
  if (!dateString) return getCurrentDate();
  const date = new Date(dateString);
  const year = date.getFullYear();
  const month = String(date.getMonth() + 1).padStart(2, "0");
  const day = String(date.getDate()).padStart(2, "0");
  return `${year}/${month}/${day}`;
};

// 格式化日期时间
const formatDateTime = (date) => {
  const year = date.getFullYear();
  const month = String(date.getMonth() + 1).padStart(2, "0");
  const day = String(date.getDate()).padStart(2, "0");
  const hours = String(date.getHours()).padStart(2, "0");
  const minutes = String(date.getMinutes()).padStart(2, "0");
  const seconds = String(date.getSeconds()).padStart(2, "0");
  return `${year}/${month}/${day} ${hours}:${minutes}:${seconds}`;
};
// 获取当前日期并格式化为 YYYY-MM-DD
function getCurrentDate() {
@@ -263,4 +683,171 @@
});
</script>

<style scoped lang="scss"></style>
<style scoped lang="scss">
.print-preview-dialog {
  .el-dialog__body {
    padding: 0;
    max-height: 80vh;
    overflow-y: auto;
  }
}

.print-preview-container {
  .print-preview-header {
    padding: 15px;
    border-bottom: 1px solid #e4e7ed;
    text-align: center;
    
    .el-button {
      margin: 0 10px;
    }
  }
  
  .print-preview-content {
  padding: 20px;
  background-color: #f5f5f5;
  min-height: 400px;
}
}

.print-page {
  width: 220mm;
  height: 90mm;
  padding: 10mm;
  margin: 0 auto;
  background: white;
  box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
  margin-bottom: 10px;
  box-sizing: border-box;
}

.delivery-note {
  width: 100%;
  height: 100%;
  font-family: "SimSun", serif;
  font-size: 10px;
  line-height: 1.2;
  display: flex;
  flex-direction: column;
}

.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: 14px;
    }
    
    .value {
      margin-right: 20px;
      min-width: 80px;
      font-size: 14px;
    }
  }
}

.table-section {
  margin-bottom: 4px;
  flex: 1;
  
  .product-table {
    width: 100%;
    border-collapse: collapse;
    border: 1px solid #000;
    
         th, td {
       border: 1px solid #000;
       padding: 6px;
       text-align: center;
       font-size: 14px;
       line-height: 1.4;
     }
    
    th {
      font-weight: bold;
    }
    
    .total-label {
      text-align: right;
      font-weight: bold;
    }
    
    .total-value {
      font-weight: bold;
    }
  }
}

.footer-section {
  .footer-row {
    display: flex;
    margin-bottom: 3px;
    line-height: 20px;
    justify-content: space-between;
    
         .footer-item {
       display: flex;
       margin-right: 20px;
       
       .label {
         font-weight: bold;
         width: 80px;
         font-size: 14px;
       }
       
       .value {
         min-width: 80px;
         font-size: 14px;
       }
       
       &.address-item {
         .address-value {
           min-width: 200px;
         }
       }
     }
  }
}

@media print {
  .app-container {
    display: none;
  }
  
           .print-page {
      box-shadow: none;
      margin: 0;
      padding: 10mm;
      padding-left: 20mm;
      page-break-inside: avoid;
      page-break-after: always;
    }
   .print-page:last-child {
     page-break-after: avoid;
   }
}
</style>