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

ZY

2024-09-25 2191824072549f0da35d73686a075e59b0196321

 zy-asrs-admin/src/components/task/showTaskDetl/index.vue

@@ -51,13 +51,13 @@
        ...getColumnSearchProps('taskNo'),
    },
    {
        title: formatMessage('db.man_task_detl.matnr', '物料号'),
        title: formatMessage('db.man_task_detl.matnr', '商品编号'),
        dataIndex: ['mat$', 'matnr'],
        width: 140,
        ellipsis: true,
    },
    {
        title: formatMessage('db.man_task_detl.maktx', '物料名'),
        title: formatMessage('db.man_task_detl.maktx', '商品名称'),
        dataIndex: ['mat$', 'maktx'],
        width: 140,
        ellipsis: true,
@@ -96,6 +96,13 @@
        width: 140,
        ellipsis: true,
        ...getColumnSearchProps('orderNo'),
    },
    {
        title: formatMessage('db.man_task_detl.wave_no', '波次编号'),
        dataIndex: ['wave$', 'waveNo'],
        width: 140,
        ellipsis: true,
        ...getColumnSearchProps('waveNo'),
    },
];

@@ -151,6 +158,8 @@

watch(taskId, (newVal, oldVal) => {
    if (newVal != null) {
        state.loading = true;
        tableData.value = []
        get("/api/taskDetl/taskId/" + newVal, {}).then((resp) => {
            let result = resp.data;
            let index = 1;
@@ -160,6 +169,8 @@
                tmp.push(item)
            })
            tableData.value = tmp;

            state.loading = false;
        })

        get("/api/task/" + newVal, {}).then((resp) => {
@@ -210,11 +221,17 @@
                </div>
            </div>
            <a-table :data-source="tableData" :defaultExpandAllRows="false" :key="TABLE_KEY" rowKey="id"
                :scroll="{ y: 768 }" :columns="state.columns">
                :scroll="{ y: 768 }" :columns="state.columns" :loading="state.loading">
                <template #bodyCell="{ column, text, record }">
                    <template v-if="column.dataIndex === 'orderNo'">
                        <a-button type="link" @click="openOrderDetl(record)">{{ text }}</a-button>
                    </template>

                    <template v-if="typeof (column.dataIndex) === 'object'">
                        <template v-if="column.dataIndex[1] === 'waveNo'">
                            {{ text }}
                        </template>
                    </template>
                </template>
            </a-table>
        </a-modal>