Merge remote-tracking branch 'origin/dev_New' into dev_New

chenhj

昨天 cac302f302084ab310d0e35339f30966a4829a4e

 src/views/inventoryManagement/dispatchLog/index.vue

@@ -2,15 +2,6 @@
   <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"
@@ -26,7 +17,6 @@
            >
         </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>
@@ -40,95 +30,47 @@
            @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"
            label="出库批次"
            prop="outboundBatches"
            min-width="100"
               show-overflow-tooltip
            />
            <el-table-column
               label="供应商名称"
               prop="supplierName"
               width="250"
               label="出库日期"
               prop="createTime"
               show-overflow-tooltip
            />
            <el-table-column
               label="产品大类"
               prop="productCategory"
               width="100"
               prop="productName"
               show-overflow-tooltip
            />
            <el-table-column
               label="规格型号"
               prop="specificationModel"
               width="100"
               prop="model"
               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"
               prop="stockOutNum"
               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"
@@ -139,120 +81,6 @@
            @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>

@@ -345,15 +173,6 @@
};
const expandedRowKeys = ref([]);

// 主表合计方法
const summarizeMainTable = (param) => {
   return proxy.summarizeTable(param, [
      "contractAmount",
      "taxInclusiveTotalPrice",
      "taxExclusiveTotalPrice",
   ]);
};

// 导出
const handleOut = () => {
   ElMessageBox.confirm("是否确认导出？", "导出", {
@@ -384,7 +203,7 @@
      type: "warning",
   })
      .then(() => {
         delStockOut({ids:ids}).then((res) => {
         delStockOut(ids).then((res) => {
            proxy.$modal.msgSuccess("删除成功");
            getList();
         });
@@ -590,8 +409,8 @@
              </thead>
              <tbody>
                <tr>
                  <td>${item.productCategory || '砂灰砖'}</td>
                  <td>${item.specificationModel || '标准'}</td>
                  <td>${item.productName || '砂灰砖'}</td>
                  <td>${item.model || '标准'}</td>
                  <td>${item.unit || '块'}</td>
                  <td>${item.taxInclusiveUnitPrice || '0'}</td>
                  <td>${item.inboundNum || '2000'}</td>