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

ZY

2024-09-25 2191824072549f0da35d73686a075e59b0196321

 zy-asrs-admin/src/views/in/waitPakinLog/index.vue

@@ -15,6 +15,12 @@
let currentPage = 1;
let pageSize = 10;
const searchInput = ref("")
const searchParam = ref({
  orderNo: null,
  barcode: null,
  matnr: null,
  batch: null,
})
const editChild = ref(null)

const state = reactive({
@@ -61,17 +67,17 @@
  },
  {
    title: formatMessage('db.man_wait_pakin_log.matnr', '商品编号'),
    dataIndex: ['detl$', 'mat$', 'matnr'],
    dataIndex: 'matnr',
    width: 140,
    ellipsis: true,
    ...getColumnSearchProps('detl$.matnr'),
    ...getColumnSearchProps('matnr'),
  },
  {
    title: formatMessage('db.man_wait_pakin_log.batch', '批号'),
    dataIndex: ['detl$', 'batch'],
    dataIndex: 'batch',
    width: 140,
    ellipsis: true,
    ...getColumnSearchProps('detl$.matnr'),
    ...getColumnSearchProps('batch'),
  },
  {
    title: formatMessage('db.man_wait_pakin_log.io_status', '组托状态'),
@@ -152,7 +158,8 @@
  post('/api/waitPakinLog/page', {
    current: currentPage,
    pageSize: pageSize,
    condition: searchInput.value
    condition: searchInput.value,
    _param: searchParam.value,
  }).then((resp) => {
    let result = resp.data;
    if (result.code == 200) {
@@ -235,8 +242,21 @@
  <div>
    <EditView ref="editChild" @tableReload="handleTableReload" />
    <div class="table-header">
      <div>
        <a-input v-model:value="searchParam.orderNo"
          :placeholder="formatMessage('page.waitPakin.orderNo.input', '请输入订单编号')"
          style="width: 140px;margin-right: 10px;" />
        <a-input v-model:value="searchParam.barcode"
          :placeholder="formatMessage('page.waitPakin.barcode.input', '请输入托盘码')"
          style="width: 140px;margin-right: 10px;" />
        <a-input v-model:value="searchParam.matnr" :placeholder="formatMessage('page.waitPakin.matnr.input', '请输入商品编号')"
          style="width: 140px;margin-right: 10px;" />
        <a-input v-model:value="searchParam.batch" :placeholder="formatMessage('page.waitPakin.batch.input', '请输入批号')"
          style="width: 140px;margin-right: 10px;" />

      <a-input-search v-model:value="searchInput" :placeholder="formatMessage('page.input', '请输入')"
        style="width: 200px;" @search="onSearch" />
      </div>
      <div class="table-header-right">
        <!-- <a-button @click="handleEdit(null)" type="primary">{{ formatMessage('page.add', '添加') }}</a-button> -->
        <a-button @click="handleExport">{{ formatMessage('page.export', '导出') }}</a-button>