Merge branch 'dev_天津军泰伟业' of http://114.132.189.42:9002/r/product-inventory...

spring

16 小时以前 325e771ebdbe407f4c098531aae0c7e20cefc1a0

 src/views/inventoryManagement/dispatchLog/index.vue

@@ -1,135 +1,196 @@
<template>
   <div class="app-container">
      <div class="search_form">
         <div>
            <span class="search_title">供应商名称：</span>
            <el-input
               v-model="searchForm.supplierName"
               style="width: 240px"
               placeholder="请输入"
               @change="handleQuery"
               clearable
               prefix-icon="Search"
            />
            <el-button type="primary" @click="handleQuery" style="margin-left: 10px"
            >搜索</el-button
            >
         </div>
         <div>
            <!-- <el-button type="primary" @click="openForm('add')">新增</el-button> -->
            <el-button @click="handleOut">导出</el-button>
            <el-button type="danger" plain @click="handleDelete">删除</el-button>
            <el-button type="primary" plain @click="handlePrint">打印</el-button>
         </div>
      </div>
      <div class="table_list">
         <el-table
            :data="tableData"
            border
            v-loading="tableLoading"
            @selection-change="handleSelectionChange"
            :expand-row-keys="expandedRowKeys"
            :row-key="(row) => row.id"
            show-summary
            style="width: 100%"
            :summary-method="summarizeMainTable"
            height="calc(100vh - 18.5em)"
         >
            <el-table-column align="center" type="selection" width="55" />
            <el-table-column align="center" label="序号" type="index" width="60" />
            <el-table-column
               label="出库日期"
               prop="createTime"
               min-width="250"
               show-overflow-tooltip
            />
            <el-table-column
               label="供应商名称"
               prop="supplierName"
               width="250"
               show-overflow-tooltip
            />
            <el-table-column
               label="产品大类"
               prop="productCategory"
               width="100"
               show-overflow-tooltip
            />
            <el-table-column
               label="规格型号"
               prop="specificationModel"
               width="100"
               show-overflow-tooltip
            />
            <el-table-column
               label="单位"
               prop="unit"
               width="80"
               show-overflow-tooltip
            />
            <el-table-column
               label="出库数量"
               prop="inboundNum"
               width="100"
               show-overflow-tooltip
            />
            <el-table-column
               label="含税单价(元)"
               prop="taxInclusiveUnitPrice"
               width="100"
               show-overflow-tooltip
            />
            <el-table-column
               label="含税总价(元)"
               prop="taxInclusiveTotalPrice"
               width="100"
               show-overflow-tooltip
            />
            <el-table-column
               label="税率(%)"
               prop="taxRate"
               width="100"
               show-overflow-tooltip
            />
            <el-table-column
               label="不含税总价(元)"
               prop="taxExclusiveTotalPrice"
               width="180"
               show-overflow-tooltip
            />
            <el-table-column
               label="出库人"
               prop="createBy"
               width="80"
               show-overflow-tooltip
            />
            <!-- <el-table-column
               fixed="right"
               label="操作"
               min-width="60"
               align="center"
            >
               <template #default="scope">
                  <el-button
                     link
                     type="primary"
                     size="small"
                     @click="openForm('edit', scope.row)"
                     >编辑</el-button
                  >
               </template>
            </el-table-column> -->
         </el-table>
         <pagination
            v-show="total > 0"
            :total="total"
            layout="total, sizes, prev, pager, next, jumper"
            :page="page.current"
            :limit="page.size"
            @pagination="paginationChange"
         />
      </div>
		
      <el-tabs v-model="activeTab" @tab-change="handleTabChange">
         <el-tab-pane label="成品出库" name="production">
            <div class="search_form">
               <div>
                  <span class="search_title ml10">出库日期：</span>
                  <el-date-picker
                     v-model="searchForm.timeStr"
                     type="date"
                     placeholder="请选择日期"
                     value-format="YYYY-MM-DD"
                     format="YYYY-MM-DD"
                     clearable
                     @change="handleQuery"
                  />
                  <span class="search_title ml10">产品大类：</span>
                  <el-input
                     v-model="searchForm.productCategory"
                     style="width: 240px"
                     placeholder="请输入"
                     clearable
                  />
                  <el-button type="primary" @click="handleQuery" style="margin-left: 10px">搜索</el-button>
               </div>
               <div>
                  <el-button @click="handleOut">导出</el-button>
                  <el-button type="danger" plain @click="handleDelete">删除</el-button>
                  <el-button type="primary" plain @click="handlePrint">打印</el-button>
               </div>
            </div>
            <div class="table_list">
               <el-table
                  :data="tableData"
                  border
                  v-loading="tableLoading"
                  @selection-change="handleSelectionChange"
                  :expand-row-keys="expandedRowKeys"
                  :row-key="(row) => row.id"
                  show-summary
                  style="width: 100%"
                  :summary-method="summarizeMainTable"
                  height="calc(100vh - 18.5em)"
               >
                  <el-table-column align="center" type="selection" width="55" />
                  <el-table-column align="center" label="序号" type="index" width="60" />
                  <el-table-column label="出库日期" prop="createTime" width="120" show-overflow-tooltip />
                  <el-table-column label="销售合同号" prop="salesContractNo" width="180" show-overflow-tooltip />
                  <el-table-column label="产品大类" prop="productCategory" show-overflow-tooltip />
                  <el-table-column label="规格型号" prop="specificationModel" show-overflow-tooltip />
                  <el-table-column label="单位" prop="unit" width="80" show-overflow-tooltip />
                  <el-table-column label="出库数量" prop="inboundNum" width="100" show-overflow-tooltip />
                  <el-table-column label="单价(元)" prop="unitPrice" width="150"></el-table-column>
                  <el-table-column label="总价(元)" prop="totalPrice" width="150"></el-table-column>
                  <el-table-column label="出库人" prop="createBy" width="80" show-overflow-tooltip />
               </el-table>
               <pagination
                  v-show="total > 0"
                  :total="total"
                  layout="total, sizes, prev, pager, next, jumper"
                  :page="page.current"
                  :limit="page.size"
                  @pagination="paginationChange"
               />
            </div>
         </el-tab-pane>

         <el-tab-pane label="原料出库" name="purchase">
            <div class="search_form">
               <div>
                  <span class="search_title ml10">出库日期：</span>
                  <el-date-picker
                     v-model="searchForm.timeStr"
                     type="date"
                     placeholder="请选择日期"
                     value-format="YYYY-MM-DD"
                     format="YYYY-MM-DD"
                     clearable
                     @change="handleQuery"
                  />
                  <span class="search_title ml10">产品大类：</span>
                  <el-input
                     v-model="searchForm.productCategory"
                     style="width: 240px"
                     placeholder="请输入"
                     clearable
                  />
                  <el-button type="primary" @click="handleQuery" style="margin-left: 10px">搜索</el-button>
               </div>
               <div>
                  <el-button @click="handleOut">导出</el-button>
                  <el-button type="danger" plain @click="handleDelete">删除</el-button>
                  <el-button type="primary" plain @click="handlePrint">打印</el-button>
               </div>
            </div>
            <div class="table_list">
               <el-table
                  :data="tableData"
                  border
                  v-loading="tableLoading"
                  @selection-change="handleSelectionChange"
                  :expand-row-keys="expandedRowKeys"
                  :row-key="(row) => row.id"
                  show-summary
                  style="width: 100%"
                  :summary-method="summarizeMainTable"
                  height="calc(100vh - 18.5em)"
               >
                  <el-table-column align="center" type="selection" width="55" />
                  <el-table-column align="center" label="序号" type="index" width="60" />
                  <el-table-column label="出库日期" prop="createTime" width="120" show-overflow-tooltip />
                  <el-table-column label="采购合同号" prop="purchaseContractNumber" width="180" show-overflow-tooltip />
                  <el-table-column label="产品大类" prop="productCategory" show-overflow-tooltip />
                  <el-table-column label="规格型号" prop="specificationModel" show-overflow-tooltip />
                  <el-table-column label="单位" prop="unit" width="80" show-overflow-tooltip />
                  <el-table-column label="出库数量" prop="inboundNum" width="100" show-overflow-tooltip />
                  <el-table-column label="含税单价(元)" prop="taxInclusiveUnitPrice" width="150"></el-table-column>
                  <el-table-column label="含税总价(元)" prop="taxInclusiveTotalPrice" width="150"></el-table-column>
                  <el-table-column label="出库人" prop="createBy" width="80" show-overflow-tooltip />
               </el-table>
               <pagination
                  v-show="total > 0"
                  :total="total"
                  layout="total, sizes, prev, pager, next, jumper"
                  :page="page.current"
                  :limit="page.size"
                  @pagination="paginationChange"
               />
            </div>
         </el-tab-pane>

      <el-tab-pane label="生产出库" name="semiProduct">
        <div class="search_form">
          <div>
            <span class="search_title ml10">出库日期：</span>
            <el-date-picker
                v-model="searchForm.timeStr"
                type="date"
                placeholder="请选择日期"
                value-format="YYYY-MM-DD"
                format="YYYY-MM-DD"
                clearable
                @change="handleQuery"
            />
            <span class="search_title ml10">产品大类：</span>
            <el-input
                v-model="searchForm.productCategory"
                style="width: 240px"
                placeholder="请输入"
                clearable
            />
            <el-button type="primary" @click="handleQuery" style="margin-left: 10px">搜索</el-button>
          </div>
          <div>
            <el-button @click="handleOut">导出</el-button>
            <el-button type="danger" plain @click="handleDelete">删除</el-button>
            <el-button type="primary" plain @click="handlePrint">打印</el-button>
          </div>
        </div>
        <div class="table_list">
          <el-table
              :data="tableData"
              border
              v-loading="tableLoading"
              @selection-change="handleSelectionChange"
              :expand-row-keys="expandedRowKeys"
              :row-key="(row) => row.id"
              show-summary
              style="width: 100%"
              :summary-method="summarizeMainTable"
              height="calc(100vh - 18.5em)"
          >
            <el-table-column align="center" type="selection" width="55" />
            <el-table-column align="center" label="序号" type="index" width="60" />
            <el-table-column label="出库日期" prop="createTime" width="220" show-overflow-tooltip />
            <el-table-column label="产品大类" prop="productCategory" show-overflow-tooltip />
            <el-table-column label="规格型号" prop="specificationModel" show-overflow-tooltip />
            <el-table-column label="单位" prop="unit" width="100" show-overflow-tooltip />
            <el-table-column label="出库数量" prop="inboundNum" width="220" show-overflow-tooltip />
            <el-table-column label="出库人" prop="createBy" width="220" show-overflow-tooltip />
          </el-table>
          <pagination
              v-show="total > 0"
              :total="total"
              layout="total, sizes, prev, pager, next, jumper"
              :page="page.current"
              :limit="page.size"
              @pagination="paginationSemiProductChange"
          />
        </div>
      </el-tab-pane>
      </el-tabs>

      <!-- 打印预览弹窗 -->
      <el-dialog
         v-model="printPreviewVisible"
@@ -153,10 +214,10 @@
               <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="company-name">军泰伟业（天津）有限公司</div>
                        <div class="document-title">零售发货单</div>
                     </div>
							

                     <div class="info-section">
                        <div class="info-row">
                           <div>
@@ -164,7 +225,7 @@
                              <span class="value">{{ formatDate(item.createTime) }}</span>
                           </div>
                           <div>
										

                              <span class="label">客户名称：</span>
                              <span class="value">{{ item.supplierName || '张爱有' }}</span>
                           </div>
@@ -174,7 +235,7 @@
                           <span class="value">{{ item.code }}</span>
                        </div>
                     </div>
							

                     <div class="table-section">
                        <table class="product-table">
                           <thead>
@@ -209,7 +270,7 @@
                           </tfoot>
                        </table>
                     </div>
							

                     <div class="footer-section">
                        <div class="footer-row">
                           <div class="footer-item">
@@ -241,24 +302,29 @@
            </div>
         </div>
      </el-dialog>
	
	


   </div>
</template>

<script setup>
import pagination from "@/components/PIMTable/Pagination.vue";
import { ref } from "vue";
import { ref, reactive, toRefs, onMounted, getCurrentInstance } from "vue";
import { ElMessageBox } from "element-plus";
import useUserStore from "@/store/modules/user";
import {
   getStockOutPage,
   delStockOut,
  getStockOutSemiProductPage,
} from "@/api/inventoryManagement/stockOut.js";
import {
   getStockInPageByProduct,
} from "@/api/inventoryManagement/stockIn.js";

const userStore = useUserStore();
const { proxy } = getCurrentInstance();
const tableData = ref([]);
const activeTab = ref('production');
const selectedRows = ref([]);
const tableLoading = ref(false);
const page = reactive({
@@ -275,6 +341,9 @@
const data = reactive({
   searchForm: {
      supplierName: "",
      customerName: "",
       productCategory:'',
      timeStr: '',
   },
   form: {
      supplierId: null,
@@ -309,20 +378,71 @@
   page.size = obj.limit;
   getList();
};
const paginationSemiProductChange = (obj) => {
  page.current = obj.page;
  page.size = obj.limit;
  getList();
};
const getList = () => {
   tableLoading.value = true;
   getStockOutPage({ ...searchForm.value, ...page })
      .then((res) => {
         tableLoading.value = false;
         tableData.value = res.data.records;
         tableData.value.map((item) => {
            item.children = [];
         });
         total.value = res.data.total;
      })
      .catch(() => {
         tableLoading.value = false;
      });
   const params = { ...page }
   if (activeTab.value === 'production') {
      params.customerName = searchForm.value.customerName
      params.timeStr = searchForm.value.timeStr
   } else {
      params.supplierName = searchForm.value.supplierName
      params.timeStr = searchForm.value.timeStr
   }
    params.productCategory = searchForm.value.productCategory

   // 根据不同的 tab 类型调用不同的接口\
  if (activeTab.value === 'semiProduct') {
    const apiCall = getStockOutSemiProductPage(params)
    apiCall
        .then((res) => {
          tableLoading.value = false;
          tableData.value = res.data.records;
        })
  }else {
    const apiCall = activeTab.value === 'production'
        ? getStockInPageByProduct(params)
        : getStockOutPage(params)

    apiCall
        .then((res) => {
          tableLoading.value = false;
          tableData.value = res.data.records;
          tableData.value.map((item) => {
            item.children = [];
            // 前端计算总价
            const inboundNum = Number(item.inboundNum) || 0;
            if (activeTab.value === 'production') {
              // 成品出库：总价 = unitPrice × inboundNum
              const unitPrice = Number(item.unitPrice) || 0;
              item.totalPrice = (unitPrice * inboundNum).toFixed(2);
            } else {
              // 原料出库：总价 = taxInclusiveUnitPrice × inboundNum
              const taxInclusiveUnitPrice = Number(item.taxInclusiveUnitPrice) || 0;
              item.taxInclusiveTotalPrice = (taxInclusiveUnitPrice * inboundNum).toFixed(2);
            }
          });
          total.value = res.data.total;
        })
        .catch(() => {
          tableLoading.value = false;
        });
  }

};

const handleTabChange = () => {
   page.current = 1
   searchForm.value.supplierName = ''
   searchForm.value.customerName = ''
   searchForm.value.timeStr = ''
   selectedRows.value = []
     searchForm.value.productCategory = ''
   getList()
};

// 表格选择数据
@@ -350,7 +470,12 @@
      type: "warning",
   })
      .then(() => {
         proxy.download("/stockmanagement/export", {}, "出库台账.xlsx");
         // 根据不同的 tab 类型调用不同的导出接口
         let exportUrl = "/stockmanagement/export"
         if (activeTab.value === 'production') {
            exportUrl = "/stockmanagement/exportone"
         }
         proxy.download(exportUrl, {}, "出库台账.xlsx");
      })
      .catch(() => {
         proxy.$modal.msg("已取消");
@@ -397,10 +522,10 @@
const executePrint = () => {
   console.log('开始执行打印，数据条数:', printData.value.length);
   console.log('打印数据:', printData.value);
	

   // 创建一个新的打印窗口
   const printWindow = window.open('', '_blank', 'width=800,height=600');
	

   // 构建打印内容
   let printContent = `
    <!DOCTYPE html>
@@ -536,14 +661,14 @@
    </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="company-name">军泰伟业（天津）有限公司</div>
            <div class="document-title">零售发货单</div>
          </div>
          
@@ -629,16 +754,16 @@
      </div>
    `;
   });
	

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

   // 写入内容到新窗口
   printWindow.document.write(printContent);
   printWindow.document.close();
	

   // 等待内容加载完成后打印
   printWindow.onload = () => {
      setTimeout(() => {
@@ -698,12 +823,12 @@
      padding: 15px;
      border-bottom: 1px solid #e4e7ed;
      text-align: center;
		

      .el-button {
         margin: 0 10px;
      }
   }
	

   .print-preview-content {
      padding: 20px;
      background-color: #f5f5f5;
@@ -735,13 +860,13 @@
.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;
@@ -753,16 +878,16 @@
   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;
@@ -774,12 +899,12 @@
.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;
@@ -787,16 +912,16 @@
         font-size: 14px;
         line-height: 1.4;
      }
		

      th {
         font-weight: bold;
      }
		

      .total-label {
         text-align: right;
         font-weight: bold;
      }
		

      .total-value {
         font-weight: bold;
      }
@@ -809,22 +934,22 @@
      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;
@@ -838,7 +963,7 @@
   .app-container {
      display: none;
   }
	

   .print-page {
      box-shadow: none;
      margin: 0;
@@ -852,3 +977,5 @@
   }
}
</style>