skyouc
2025-08-07 33b5b3d2fb2b41cdce6e4cb783f27ee70ad3afb8
zy-asrs-admin/src/components/orderOut/orderOutWavePreview/index.vue
@@ -174,17 +174,37 @@
        list: tableData.value
    };
    post('/api/out/orderOut/merge/wave', requestParam).then((resp) => {
        let result = resp.data;
        if (result.code == 200) {
            message.success(formatMessage('page.add.success', '出库成功'));
            open.value = false;
            emit('closeParent', true)
            emit('reload', true)
        } else {
            message.error(result.msg);
        }
    })
    let locs = tableData.value.filter(item => item.locId == null && item.locs.length < 1);
    if (locs != null && locs.length > 0) {
        message.error("物料库存不足,无法生成出库任务 !!");
        return
    }
    Modal.confirm({
        title: formatMessage('page.cancel', '取消'),
        content: formatMessage('page.cancel.confirm', '确定生成出库任务吗?'),
        maskClosable: true,
        onOk: async () => {
            const hide = message.loading(formatMessage('common.loading', '请求中'));
            try {
                post('/api/out/orderOut/merge/wave', requestParam).then((resp) => {
                    let result = resp.data;
                    if (result.code == 200) {
                        message.success(formatMessage('page.add.success', '出库成功'));
                        open.value = false;
                        emit('closeParent', true)
                        emit('reload', true)
                    } else {
                        message.error(result.msg);
                    }
                })
            } catch (error) {
                message.error(formatMessage('common.fail', '请求失败'));
            }
        },
    });
}
const handleOrderMergePreview = async () => {
@@ -353,7 +373,7 @@
                <template #bodyCell="{ column, text, record, index }">
                    <template v-if="column.dataIndex === 'locNo'">
                        <div v-if="record.locId != null && record.anfme > 0">
<!--                             <a-tag color="green">{{ record.locNo }}</a-tag>-->
                            <!--                             <a-tag color="green">{{ record.locNo }}</a-tag>-->
                            <a-select v-model:value="record.locNo" :options="record.otherLocs"
                                :fieldNames="{ label: 'locNo', value: 'locId' }"
                                @change="handleOtherLocChange(index, record)">