Merge remote-tracking branch 'origin/dev_天津军泰伟业' into dev_天津军泰伟业

张诺

6 天以前 c8b65690b946b28b179796fbe2f020e732043c58

 src/views/inventoryManagement/dispatchLog/index.vue

@@ -128,71 +128,6 @@
               />
            </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="出库日期" prop="createTime" show-overflow-tooltip width="130"/>
                  <el-table-column label="批次号" prop="code" width="130" 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" show-overflow-tooltip />
                  <el-table-column label="物品类型" prop="itemType" show-overflow-tooltip />
                  <el-table-column label="出库数量" prop="inboundNum" 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" 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>
      
      <!-- 打印预览弹窗 -->
@@ -218,7 +153,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>
                     
@@ -322,7 +257,6 @@
} from "@/api/inventoryManagement/stockOut.js";
import {
   getStockInPageByProduct,
   getStockInPageByCustom,
} from "@/api/inventoryManagement/stockIn.js";

const userStore = useUserStore();
@@ -347,7 +281,7 @@
      supplierName: "",
      customerName: "",
       productCategory:'',
      timeStr: getCurrentDate(),
      timeStr: '',
   },
   form: {
      supplierId: null,
@@ -397,8 +331,6 @@
   // 根据不同的 tab 类型调用不同的接口
   const apiCall = activeTab.value === 'production' 
      ? getStockInPageByProduct(params)
      : activeTab.value === 'manual' 
      ? getStockInPageByCustom(params)
      : getStockOutPage(params)
   
   apiCall
@@ -414,7 +346,7 @@
               const unitPrice = Number(item.unitPrice) || 0;
               item.totalPrice = (unitPrice * inboundNum).toFixed(2);
            } else {
               // 原料和材料出库：总价 = taxInclusiveUnitPrice × inboundNum
               // 原料出库：总价 = taxInclusiveUnitPrice × inboundNum
               const taxInclusiveUnitPrice = Number(item.taxInclusiveUnitPrice) || 0;
               item.taxInclusiveTotalPrice = (taxInclusiveUnitPrice * inboundNum).toFixed(2);
            }
@@ -465,8 +397,6 @@
         let exportUrl = "/stockmanagement/export"
         if (activeTab.value === 'production') {
            exportUrl = "/stockmanagement/exportone"
         } else if (activeTab.value === 'manual') {
            exportUrl = "/stockmanagement/exportTwo"
         }
         proxy.download(exportUrl, {}, "出库台账.xlsx");
      })
@@ -661,7 +591,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>