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

maven

2025-09-18 bc278f02a34cdce5be02e42b26fe9e1bc6a0d6e6

 src/views/inventoryManagement/dispatchLog/index.vue

@@ -19,6 +19,7 @@
        <!-- <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">
@@ -39,7 +40,7 @@
        <el-table-column
          label="出库日期"
          prop="createTime"
          min-width="130"
               min-width="250"
          show-overflow-tooltip
        />
        <el-table-column
@@ -75,13 +76,13 @@
        <el-table-column
          label="含税单价(元)"
          prop="taxInclusiveUnitPrice"
          width="200"
               width="100"
          show-overflow-tooltip
        />
        <el-table-column
          label="含税总价(元)"
          prop="taxInclusiveTotalPrice"
          width="200"
               width="100"
          show-overflow-tooltip
        />
        <el-table-column
@@ -227,7 +228,7 @@
                <div class="footer-row">
                                     <div class="footer-item">
                     <span class="label">操作员：</span>
                     <span class="value">{{ userStore.nickname || '撕开前' }}</span>
                              <span class="value">{{ userStore.nickName || '撕开前' }}</span>
                   </div>
                  <div class="footer-item">
                    <span class="label">打印日期：</span>
@@ -281,7 +282,7 @@
    productId: null,
    productName: '',
    userId: userStore.userId,
    nickname: '',
      nickName: '',
    model: '',
    productModelId: null,
    unit: '',
@@ -616,7 +617,7 @@
            <div class="footer-row">
              <div class="footer-item">
                <span class="label">操作员：</span>
                <span class="value">${userStore.nickname || '撕开前'}</span>
                <span class="value">${userStore.nickName || '撕开前'}</span>
              </div>
              <div class="footer-item">
                <span class="label">打印日期：</span>