天津双奇点-仓储物流相关问题修复

周宾

2 天以前 cd17315666ec8099678c55329d3e5889efb23c1e

 src/views/inventoryManagement/dispatchLog/index.vue

@@ -1,144 +1,210 @@
<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"
            />
            <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"
            />
            <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" min-width="120" 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" show-overflow-tooltip />
                  <el-table-column label="产品名称" prop="productCategory" show-overflow-tooltip />
                  <el-table-column label="产品高度" prop="specificationModel" width="100" show-overflow-tooltip>
                  <template #default="scope">
                     <div>{{ scope.row.specificationModel }}{{ scope.row.unit }}</div>
                  </template>
                  </el-table-column>
                  <el-table-column label="出库数量/件" prop="inboundNum" show-overflow-tooltip />
                  <el-table-column label="每件数量/支" prop="boxNum" width="100" show-overflow-tooltip />
                  <el-table-column label="单价(元)/支" prop="taxInclusiveUnitPrice" width="150"></el-table-column>
                  <el-table-column label="单价(美元)/支" prop="dollarPrice" width="150"></el-table-column>
                  <el-table-column label="纸箱规格" prop="cartonSpecifications" width="150"></el-table-column>
                  <el-table-column label="出库人" prop="createBy" 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="manual">
            <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="产品图片" width="100" align="center">
                     <template #default="scope">
                        <img class="barcode-img" :src="javaApiUrl+scope.row.url"></img>
                     </template>
                  </el-table-column>
                  <el-table-column label="出库日期" prop="createTime" width="150" show-overflow-tooltip />
                  <el-table-column label="产品名称" prop="productCategory" show-overflow-tooltip />
                  <el-table-column label="产品高度" prop="specificationModel" width="100" show-overflow-tooltip>
                  <template #default="scope">
                     <div>{{ scope.row.specificationModel }}{{ scope.row.unit }}</div>
                  </template>
                  </el-table-column>
                  <el-table-column label="出库数量/件" prop="inboundNum" width="150" show-overflow-tooltip />
                  <el-table-column label="每件数量/支" prop="boxNum" width="100" show-overflow-tooltip />
                  <el-table-column label="单价(元)/件" prop="taxInclusiveUnitPrice" width="150"></el-table-column>
                  <el-table-column label="单价(美元)/件" prop="dollarPrice" width="150"></el-table-column>
                  <el-table-column label="纸箱规格" prop="cartonSpecifications" width="150"></el-table-column>
                  <el-table-column label="出库人" prop="createBy" width="150" 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-tabs>
      
      <!-- 打印预览弹窗 -->
      <el-dialog
@@ -163,7 +229,7 @@
               <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>
                     
@@ -190,32 +256,34 @@
                           <thead>
                           <tr>
                              <th>产品名称</th>
                              <th>规格型号</th>
                              <th>单位</th>
                              <th>单价</th>
                              <th>零售数量</th>
                              <th>零售金额</th>
                              <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.productCategory || '' }}</td>
                              <td>{{ item.specificationModel || '' }}{{ item.unit || '' }}</td>
                              <td>{{ item.taxInclusiveUnitPrice || '0' }}</td>
                              <td>{{ item.inboundNum || '2000' }}</td>
                              <td>{{ item.taxInclusiveTotalPrice || '0' }}</td>
                              <td>{{ item.dollarPrice || '0' }}</td>
                              <td>{{ item.inboundNum || '0' }}</td>
                              <td>{{ item.boxNum || '0' }}</td>
                              <td>{{ item.cartonSpecifications || '0' }}</td>
                           </tr>
                           </tbody>
                           <tfoot>
                           <tr>
                           <!-- <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>
                           </tr> -->
                           </tfoot>
                        </table>
                     </div>
@@ -258,17 +326,23 @@

<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,
} from "@/api/inventoryManagement/stockOut.js";
import {
   getStockInPageByProduct,
   getStockInPageByCustom,
} from "@/api/inventoryManagement/stockIn.js";
const javaApiUrl = __BASE_API__;

const userStore = useUserStore();
const { proxy } = getCurrentInstance();
const tableData = ref([]);
const activeTab = ref('purchase');
const selectedRows = ref([]);
const tableLoading = ref(false);
const page = reactive({
@@ -285,7 +359,9 @@
const data = reactive({
   searchForm: {
      supplierName: "",
      timeStr: "",
      customerName: "",
       productCategory:'',
      timeStr: getCurrentDate(),
   },
   form: {
      supplierId: null,
@@ -322,18 +398,56 @@
};
const getList = () => {
   tableLoading.value = true;
   getStockOutPage({ ...searchForm.value, ...page })
   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 类型调用不同的接口
   const apiCall = activeTab.value === 'production' 
      ? getStockInPageByProduct(params)
      : activeTab.value === 'manual' 
      ? getStockInPageByCustom(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()
};

// 表格选择数据
@@ -361,7 +475,14 @@
      type: "warning",
   })
      .then(() => {
         proxy.download("/stockmanagement/export", {}, "出库台账.xlsx");
         // 根据不同的 tab 类型调用不同的导出接口
         let exportUrl = "/stockmanagement/export"
         if (activeTab.value === 'production') {
            exportUrl = "/stockmanagement/exportone"
         } else if (activeTab.value === 'manual') {
            exportUrl = "/stockmanagement/exportTwo"
         }
         proxy.download(exportUrl, {}, "出库台账.xlsx");
      })
      .catch(() => {
         proxy.$modal.msg("已取消");
@@ -554,7 +675,7 @@
      <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>
          
@@ -576,39 +697,33 @@
          </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>
         <table class="product-table">
            <thead>
            <tr>
               <th>产品名称</th>
               <th>产品高度</th>
               <th>单价（元）/件</th>
               <th>单价（美元）/件</th>
               <th>零售数量/件</th>
               <th>每件数量/支</th>
               <th>纸箱规格</th>
            </tr>
            </thead>
            <tbody>
            <tr>
               <td>{{ item.productCategory || '' }}</td>
               <td>{{ item.specificationModel || '' }}{{ item.unit || '' }}</td>
               <td>{{ item.taxInclusiveUnitPrice || '0' }}</td>
               <td>{{ item.dollarPrice || '0' }}</td>
               <td>{{ item.inboundNum || '0' }}</td>
               <td>{{ item.boxNum || '0' }}</td>
               <td>{{ item.cartonSpecifications || '0' }}</td>
            </tr>
            </tbody>
            <tfoot>
            </tfoot>
         </table>
      </div>

          <div class="footer-section">
            <div class="footer-row">
@@ -862,4 +977,12 @@
      page-break-after: avoid;
   }
}
.barcode-img{
  width: 80px;
  height: 80px;
  border-radius: 5px;
  background-color: #F5F5F5;
}
</style>