1.海川开心-发货字段和打印展示公司修改

gaoluyang

8 小时以前 a582232206853830512bbafe8f7a4358c7a25aff

 src/views/inventoryManagement/dispatchLog/index.vue

@@ -4,15 +4,6 @@
         <el-tab-pane label="成品出库" name="production">
            <div class="search_form">
               <div>
<!--                  <span class="search_title">客户名称：</span>-->
<!--                  <el-input-->
<!--                     v-model="searchForm.customerName"-->
<!--                     style="width: 240px"-->
<!--                     placeholder="请输入"-->
<!--                     @change="handleQuery"-->
<!--                     clearable-->
<!--                     prefix-icon="Search"-->
<!--                  />-->
                  <span class="search_title ml10">出库日期：</span>
                  <el-date-picker
                     v-model="searchForm.timeStr"
@@ -53,16 +44,14 @@
               >
                  <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="customerName" width="250" show-overflow-tooltip />-->
                  <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="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="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
@@ -79,15 +68,6 @@
         <el-tab-pane label="原料出库" name="purchase">
            <div class="search_form">
               <div>
<!--&lt;!&ndash;                  <span class="search_title">供应商名称：</span>&ndash;&gt;-->
<!--&lt;!&ndash;                  <el-input&ndash;&gt;-->
<!--&lt;!&ndash;                     v-model="searchForm.supplierName"&ndash;&gt;-->
<!--&lt;!&ndash;                     style="width: 240px"&ndash;&gt;-->
<!--&lt;!&ndash;                     placeholder="请输入"&ndash;&gt;-->
<!--&lt;!&ndash;                     @change="handleQuery"&ndash;&gt;-->
<!--&lt;!&ndash;                     clearable&ndash;&gt;-->
<!--&lt;!&ndash;                     prefix-icon="Search"&ndash;&gt;-->
<!--&lt;!&ndash;                  />&ndash;&gt;-->
                  <span class="search_title ml10">出库日期：</span>
                  <el-date-picker
                     v-model="searchForm.timeStr"
@@ -128,16 +108,14 @@
               >
                  <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 />
<!--&lt;!&ndash;                  <el-table-column label="供应商名称" prop="supplierName" width="250" show-overflow-tooltip />&ndash;&gt;-->
                  <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 />
<!--&lt;!&ndash;                  <el-table-column label="含税单价(元)" prop="taxInclusiveUnitPrice" width="100" show-overflow-tooltip />&ndash;&gt;-->
<!--&lt;!&ndash;                  <el-table-column label="含税总价(元)" prop="taxInclusiveTotalPrice" width="100" show-overflow-tooltip />&ndash;&gt;-->
<!--&lt;!&ndash;                  <el-table-column label="税率(%)" prop="taxRate" width="100" show-overflow-tooltip />&ndash;&gt;-->
<!--&lt;!&ndash;                  <el-table-column label="不含税总价(元)" prop="taxExclusiveTotalPrice" width="180" show-overflow-tooltip />&ndash;&gt;-->
                  <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
@@ -154,15 +132,6 @@
         <el-tab-pane label="材料出库" name="manual">
            <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"
@@ -203,17 +172,15 @@
               >
                  <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="supplierName" width="250" show-overflow-tooltip /> -->
                  <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="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="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
@@ -251,7 +218,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>
                     
@@ -440,6 +407,17 @@
         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;
      })
@@ -683,7 +661,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>
          
@@ -992,3 +970,5 @@
   }
}
</style>