huojin
/
YouChain_WMS_Web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

批量退货、批量收货

main
HUOJIN\92525 2025-04-08 17:59:48 +08:00
parent 95966d41d1
commit 72a1b7773e
14 changed files with 222 additions and 419 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nc_wms_web/src/api/business/wms/base/address/address-api.ts
View File

@ -12,21 +12,21 @@ export const addressApi = {
/**
* 分页查询 @author hj
*/
queryPage: (param) => {
queryPage: (param:object) => {
return postRequest('/address/queryPage', param);
},
/**
* 增加 @author hj
*/
add: (param) => {
add: (param:object) => {
return postRequest('/address/add', param);
},
/**
* 修改 @author hj
*/
update: (param) => {
update: (param:object) => {
return postRequest('/address/update', param);
},

11
nc_wms_web/src/api/business/wms/receive/receive-api.ts
View File

@ -12,8 +12,15 @@ export const receiveApi = {
/**
* 批量收货 @author 霍锦
*/
batchReceive: (idList: number[]) => {
return postRequest('/receive/batchReceive', idList);
batchReceive: (param: object) => {
return postRequest('/receive/batchReceive', param);
},
/**
* 批量退货 @author 霍锦
*/
batchReturn: (param: object) => {
return postRequest('/receive/batchReturn', param);
},
};

4
nc_wms_web/src/views/business/wms/base/address/address-list.vue
View File

@ -13,13 +13,13 @@
<AddressSelect v-model:value="queryForm.addressId" @change="changeAddressSelect"/>
</a-form-item>
<a-form-item class="smart-query-form-item">
<a-button type="primary" @click="onSearch" class="smart-margin-left10">
<a-button type="primary" @click="onSearch" class="smart-margin-left10" v-privilege="'address:query'">
<template #icon>
<SearchOutlined/>
</template>
查询
</a-button>
<a-button @click="resetQuery" class="smart-margin-left10">
<a-button @click="resetQuery" class="smart-margin-left10" v-privilege="'address:query'">
<template #icon>
<ReloadOutlined/>
</template>

4
nc_wms_web/src/views/business/wms/base/area/area-list.vue
View File

@ -19,13 +19,13 @@
</a-select>
</a-form-item>
<a-form-item class="smart-query-form-item">
<a-button type="primary" @click="onSearch" class="smart-margin-left10">
<a-button type="primary" @click="onSearch" class="smart-margin-left10" v-privilege="'area:query'">
<template #icon>
<SearchOutlined/>
</template>
查询
</a-button>
<a-button @click="resetQuery" class="smart-margin-left10">
<a-button @click="resetQuery" class="smart-margin-left10" v-privilege="'area:query'">
<template #icon>
<ReloadOutlined/>
</template>

4
nc_wms_web/src/views/business/wms/base/customer/customer-list.vue
View File

@ -19,13 +19,13 @@
</a-select>
</a-form-item>
<a-form-item class="smart-query-form-item">
<a-button type="primary" @click="onSearch" class="smart-margin-left10">
<a-button type="primary" @click="onSearch" class="smart-margin-left10" v-privilege="'customer:query'">
<template #icon>
<SearchOutlined/>
</template>
查询
</a-button>
<a-button @click="resetQuery" class="smart-margin-left10">
<a-button @click="resetQuery" class="smart-margin-left10" v-privilege="'customer:query'">
<template #icon>
<ReloadOutlined/>
</template>

4
nc_wms_web/src/views/business/wms/base/item/item-list.vue
View File

@ -19,13 +19,13 @@
</a-select>
</a-form-item>
<a-form-item class="smart-query-form-item">
<a-button type="primary" @click="onSearch" class="smart-margin-left10">
<a-button type="primary" @click="onSearch" class="smart-margin-left10" v-privilege="'item:query'">
<template #icon>
<SearchOutlined/>
</template>
查询
</a-button>
<a-button @click="resetQuery" class="smart-margin-left10">
<a-button @click="resetQuery" class="smart-margin-left10" v-privilege="'item:query'">
<template #icon>
<ReloadOutlined/>
</template>

4
nc_wms_web/src/views/business/wms/base/location/location-list.vue
View File

@ -26,13 +26,13 @@
</a-form-item>
<a-form-item class="smart-query-form-item">
<a-button type="primary" @click="onSearch" class="smart-margin-left10">
<a-button type="primary" @click="onSearch" class="smart-margin-left10" v-privilege="'location:query'">
<template #icon>
<SearchOutlined/>
</template>
查询
</a-button>
<a-button @click="resetQuery" class="smart-margin-left10">
<a-button @click="resetQuery" class="smart-margin-left10" v-privilege="'location:query'">
<template #icon>
<ReloadOutlined/>
</template>

4
nc_wms_web/src/views/business/wms/base/stock/stock-list.vue
View File

@ -25,13 +25,13 @@
</a-select>
</a-form-item>
<a-form-item class="smart-query-form-item">
<a-button type="primary" @click="onSearch" class="smart-margin-left10">
<a-button type="primary" @click="onSearch" class="smart-margin-left10" v-privilege="'stock:query'">
<template #icon>
<SearchOutlined/>
</template>
查询
</a-button>
<a-button @click="resetQuery" class="smart-margin-left10">
<a-button @click="resetQuery" class="smart-margin-left10" v-privilege="'stock:query'">
<template #icon>
<ReloadOutlined/>
</template>

17
nc_wms_web/src/views/business/wms/receive/asn/asn-form.vue
View File

@ -82,12 +82,12 @@
</a-page-header>
</div>
<a-card class="smart-margin-top10" size="small">
<a-tabs>
<a-tabs @change="handleTabChange">
<a-tab-pane key="asnDetail" tab="入库明细">
<ReceiveDetailList :asnId="form.asnId"/>
<ReceiveDetailList ref="receiveDetailListRef" :asnId="form.asnId" />
</a-tab-pane>
<a-tab-pane key="asnTask" tab="收货详情">
<AsnTaskList :asnId="form.asnId"/>
<AsnTaskList ref="asnTaskListRef" :asnId="form.asnId"/>
</a-tab-pane>
<a-tab-pane key="dataTracer" tab="操作记录">
<DataTracer :dataId="form.asnId" :type="DATA_TRACER_TYPE_ENUM.OA_ENTERPRISE.value"/>
@ -234,6 +234,17 @@ function onBack() {
query: {refresh: '1'}
});
}
//选项卡
const receiveDetailListRef = ref()
const asnTaskListRef = ref()
function handleTabChange(activeKey: string) {
if (activeKey === 'asnDetail' && receiveDetailListRef.value) {
receiveDetailListRef.value.queryData();
}else if(activeKey === 'asnTask' && asnTaskListRef.value){
asnTaskListRef.value.queryData();
}
}
</script>
<style lang="less" scoped>

4
nc_wms_web/src/views/business/wms/receive/asn/asn-list.vue
View File

@ -13,13 +13,13 @@
<a-input style="width: 200px" v-model:value="queryForm.customerNumber" placeholder="客户订单号"/>
</a-form-item>
<a-form-item class="smart-query-form-item">
<a-button type="primary" @click="onSearch" class="smart-margin-left10">
<a-button type="primary" @click="onSearch" class="smart-margin-left10" v-privilege="'asn:query'">
<template #icon>
<SearchOutlined/>
</template>
查询
</a-button>
<a-button @click="resetQuery" class="smart-margin-left10">
<a-button @click="resetQuery" class="smart-margin-left10" v-privilege="'asn:query'">
<template #icon>
<ReloadOutlined/>
</template>

140
nc_wms_web/src/views/business/wms/receive/asn/batch-receive-form.vue 100644
View File

@ -0,0 +1,140 @@
<!--
* 批量收货
*
* @Author: 霍锦
* @Date: 2025-03-26 15:16:28
* @Copyright 友仓
-->
<template>
<a-modal
:title="'批量收货'"
:width="600"
:open="visibleFlag"
@cancel="onClose"
:maskClosable="false"
:destroyOnClose="true"
>
<a-form ref="formRef" :model="form" :rules="rules" :label-col="{ span: 5 }">
<a-form-item label="容器" name="stockCode">
<StockSelect style="width: 100%" v-model:value="form.stockCode" :disabledFlag="true"
@change="changeStockSelect"/>
</a-form-item>
<a-form-item label="库位" name="locationCode">
<LocationSelect style="width: 100%" v-model:value="form.locationCode" :disabledFlag="true"
@change="changeLocationSelect"/>
</a-form-item>
</a-form>
<template #footer>
<a-space>
<a-button @click="onClose">取消</a-button>
<a-button type="primary" @click="onSubmit">保存</a-button>
</a-space>
</template>
</a-modal>
</template>
<script setup lang="ts">
import {reactive, ref, nextTick} from 'vue';
import {message} from 'ant-design-vue';
import {SmartLoading} from '/@/components/framework/smart-loading';
import {smartSentry} from '/@/lib/smart-sentry';
import StockSelect from "/@/views/business/wms/base/stock/stock-select.vue";
import LocationSelect from "/@/views/business/wms/base/location/location-select.vue";
import {receiveApi} from "/@/api/business/wms/receive/receive-api";
// ------------------------ 事件 ------------------------
const emits = defineEmits(['reloadList']);
// ------------------------ 显示与隐藏 ------------------------
// 是否显示
const visibleFlag = ref(false);
function show(asnId: number, asnDetailIds: number[]) {
Object.assign(form, formDefault);
//将选中的id集合赋值
form.asnId = asnId;
form.asnDetailIds = asnDetailIds;
visibleFlag.value = true;
nextTick(() => {
formRef.value.clearValidate();
});
}
function onClose() {
Object.assign(form, formDefault);
visibleFlag.value = false;
}
//选择容器
function changeStockSelect(selectValue: any) {
if (selectValue) {
form.stockCode = selectValue.stockCode;
}
}
//选中库位
function changeLocationSelect(selectValue: any) {
if (selectValue) {
form.locationCode = selectValue.locationCode;
}
}
// ------------------------ 表单 ------------------------
// 组件ref
const formRef = ref();
const formDefault = {
asnId: undefined,//入库单
asnDetailIds: undefined,//入库单明细id
stockCode: undefined, //容器
locationCode: undefined,//库位
};
let form = reactive({...formDefault});
const rules = {
stockCode: [{required: true, message: '容器 必填'}],
locationCode: [{required: true, message: '库位 必填'}],
};
// 点击确定，验证表单
async function onSubmit() {
try {
await formRef.value.validateFields();
await save();
} catch (err) {
message.error('参数验证错误，请仔细填写表单数据!');
}
}
// 确认收货
async function save() {
SmartLoading.show();
try {
const response = await receiveApi.batchReceive(form);
const {error, success} = JSON.parse(response.msg);
if (error) {
message.error(error);
}
if (success) {
message.success(success);
}
emits('reloadList');
onClose();
} catch (err) {
smartSentry.captureError(err);
} finally {
SmartLoading.hide();
}
}
defineExpose({
show,
});
</script>

64
nc_wms_web/src/views/business/wms/receive/asn/receive-detail-list.vue
View File

@ -13,8 +13,9 @@
<div>
关键字：
<a-input style="width: 250px" v-model:value="queryForm.keyword" placeholder="姓名/手机号/登录账号"/>
<a-button class="button-style" type="primary" @click="onSearch">搜索</a-button>
<a-button class="button-style" type="default" @click="resetQuery">重置</a-button>
<a-button class="button-style" type="primary" @click="onSearch" v-privilege="'asnDetail:query'">搜索</a-button>
<a-button class="button-style" type="default" @click="resetQuery" v-privilege="'asnDetail:query'">重置
</a-button>
</div>
<div class="smart-table-setting-block">
@ -25,7 +26,7 @@
</template>
添加明细
</a-button>
<a-button class="button-style" type="primary" v-privilege="'receive:batchReceive'" @click="confirmBatchReceive"
<a-button class="button-style" type="primary" v-privilege="'receive:batchReceive'" @click="showBatchReceiveForm"
:disabled="props.asnId==0 || selectedRowKeyList.length == 0">
<template #icon>
<EditOutlined/>
@ -92,8 +93,12 @@
:show-total="(total:number) => `共${total}条`"
/>
</div>
<!--新建/编辑-->
<!--添加明细/编辑明细-->
<AsnDetailForm ref="formRef" @reloadList="queryData"/>
<!-- 批量收货-->
<BatchReceiveForm ref="batchReceiveFormRef" @reloadList="queryData"/>
</div>
</template>
<script setup lang="ts">
@ -103,10 +108,10 @@ import {smartSentry} from '/@/lib/smart-sentry';
import {TABLE_ID_CONST} from "/@/constants/support/table-id-const";
import TableOperator from "/@/components/support/table-operator/index.vue";
import {asnDetailApi} from "/@/api/business/wms/receive/asnDetail/asn-detail-api";
import {receiveApi} from "/@/api/business/wms/receive/receive-api";
import AsnDetailForm from "/@/views/business/wms/receive/asnDetail/asn-detail-form.vue";
import {message, Modal} from "ant-design-vue";
import {SmartLoading} from '/@/components/framework/smart-loading';
import BatchReceiveForm from "/@/views/business/wms/receive/asn/batch-receive-form.vue";
const props = defineProps({
asnId: {
@ -208,6 +213,14 @@ function showForm(data: object) {
formRef.value.show(data, props.asnId);
}
//批量收货
const batchReceiveFormRef = ref();
function showBatchReceiveForm() {
batchReceiveFormRef.value.show(props.asnId, selectedRowKeyList.value);
}
//确认是否删除？
function onDelete(data: object) {
Modal.confirm({
@ -280,42 +293,6 @@ async function requestBatchDelete() {
}
}
//批量收货 confirmBatchReceive
function confirmBatchReceive() {
Modal.confirm({
title: '提示',
content: '确定是否批量收货?',
okText: '确认',
okType: 'danger',
onOk() {
requestBatchReceive();
},
cancelText: '取消',
onCancel() {
},
});
}
//请求批量收货
async function requestBatchReceive() {
try {
SmartLoading.show();
const response = await receiveApi.batchReceive(selectedRowKeyList.value);
const {error, success} = JSON.parse(response.msg);
if (error) {
message.error(error);
}
if (success) {
message.success(success);
}
await queryData();
} catch (e) {
smartSentry.captureError(e);
} finally {
SmartLoading.hide();
}
}
watch(
() => props.asnId,
(e) => {
@ -325,6 +302,11 @@ watch(
},
{immediate: true}
);
defineExpose({
queryData
});
</script>
<style scoped lang="less">

283
nc_wms_web/src/views/business/wms/receive/asnDetail/asn-detail-list.vue
View File

@ -1,283 +0,0 @@
<!--
* 入库明细
*
* @Author: 霍锦
* @Date: 2025-03-26 15:16:28
* @Copyright 友仓
-->
<template>
<!---------- 查询表单form begin ----------->
<a-form class="smart-query-form">
<a-row class="smart-query-form-row">
<a-form-item label="物料" class="smart-query-form-item">
<a-input style="width: 200px" v-model:value="queryForm.itemId" placeholder="物料"/>
</a-form-item>
<a-form-item class="smart-query-form-item">
<a-button type="primary" @click="onSearch" class="smart-margin-left10">
<template #icon>
<SearchOutlined/>
</template>
查询
</a-button>
<a-button @click="resetQuery" class="smart-margin-left10">
<template #icon>
<ReloadOutlined/>
</template>
重置
</a-button>
</a-form-item>
</a-row>
</a-form>
<!---------- 查询表单form end ----------->
<a-card size="small" :bordered="false" :hoverable="true">
<!---------- 表格操作行 begin ----------->
<a-row class="smart-table-btn-block">
<div class="smart-table-operate-block">
<a-button @click="showForm" type="primary" size="small">
<template #icon>
<PlusOutlined/>
</template>
新建
</a-button>
<a-button @click="confirmBatchDelete" type="primary" danger size="small"
:disabled="selectedRowKeyList.length == 0">
<template #icon>
<DeleteOutlined/>
</template>
批量删除
</a-button>
</div>
<div class="smart-table-setting-block">
<TableOperator v-model="columns" :tableId="TABLE_ID_CONST.BUSINESS.RECEIVE.ASN_DETAIL" :refresh="queryData"/>
</div>
</a-row>
<!---------- 表格操作行 end ----------->
<!---------- 表格 begin ----------->
<a-table
size="small"
:dataSource="tableData"
:columns="columns"
rowKey="asnDetailId"
bordered
:loading="tableLoading"
:pagination="false"
:row-selection="{ selectedRowKeys: selectedRowKeyList, onChange: onSelectChange }"
>
<template #bodyCell="{ text, record, column }">
<!-- 有图片预览时 注释解开并把下面的'picture'修改成自己的图片字段名即可 -->
<!-- <template v-if="column.dataIndex === 'picture'">
<FilePreview :fileList="text" type="picture" />
</template> -->
<!-- 使用字典时 注释解开并把下面的'dict'修改成自己的字典字段名即可 有多个字典字段就复制多份同理修改 不然不显示字典 -->
<!-- 方便修改tag的颜色 orange green purple success processing error default warning -->
<!-- <template v-if="column.dataIndex === 'dict'">
<a-tag color="cyan">
{{ text && text.length > 0 ? text.map((e) => e.valueName).join(',') : '暂无' }}
</a-tag>
</template> -->
<template v-if="column.dataIndex === 'action'">
<div class="smart-table-operate">
<a-button @click="showForm(record)" type="link">编辑</a-button>
<a-button @click="onDelete(record)" danger type="link">删除</a-button>
</div>
</template>
</template>
</a-table>
<!---------- 表格 end ----------->
<div class="smart-query-table-page">
<a-pagination
showSizeChanger
showQuickJumper
show-less-items
:pageSizeOptions="PAGE_SIZE_OPTIONS"
:defaultPageSize="queryForm.pageSize"
v-model:current="queryForm.pageNum"
v-model:pageSize="queryForm.pageSize"
:total="total"
@change="queryData"
@showSizeChange="queryData"
:show-total="(total:number) => `共${total}条`"
/>
</div>
<AsnDetailForm ref="formRef" @reloadList="queryData"/>
</a-card>
</template>
<script setup lang="ts">
import {reactive, ref, onMounted} from 'vue';
import {message, Modal} from 'ant-design-vue';
import {SmartLoading} from '/@/components/framework/smart-loading';
import {asnDetailApi} from '/@/api/business/wms/receive/asnDetail/asn-detail-api';
import {PAGE_SIZE_OPTIONS} from '/@/constants/common-const';
import {smartSentry} from '/@/lib/smart-sentry';
import TableOperator from '/@/components/support/table-operator/index.vue';
import AsnDetailForm from '/@/views/business/wms/receive/asnDetail/asn-detail-form.vue';
import {TABLE_ID_CONST} from "/@/constants/support/table-id-const";
// ---------------------------- 表格列 ----------------------------
const columns = ref([
{
title: '入库明细id',
dataIndex: 'asnDetailId',
ellipsis: true,
},
{
title: '物料id',
dataIndex: 'itemId',
ellipsis: true,
},
{
title: '订单数量',
dataIndex: 'orderQuantity',
ellipsis: true,
},
{
title: '收货数量',
dataIndex: 'receivedQuantity',
ellipsis: true,
},
{
title: '创建时间',
dataIndex: 'createTime',
ellipsis: true,
},
{
title: '操作',
dataIndex: 'action',
fixed: 'right',
width: 90,
},
]);
// ---------------------------- 查询数据表单和方法 ----------------------------
const queryFormState = {
itemId: undefined, //物料
pageNum: 1,
pageSize: 10,
};
// 查询表单form
const queryForm = reactive({...queryFormState});
// 表格加载loading
const tableLoading = ref(false);
// 表格数据
const tableData = ref([]);
// 总数
const total = ref(0);
// 重置查询条件
function resetQuery() {
let pageSize = queryForm.pageSize;
Object.assign(queryForm, queryFormState);
queryForm.pageSize = pageSize;
queryData();
}
// 搜索
function onSearch() {
queryForm.pageNum = 1;
queryData();
}
// 查询数据
async function queryData() {
tableLoading.value = true;
try {
let queryResult = await asnDetailApi.queryPage(queryForm);
tableData.value = queryResult.data.list;
total.value = queryResult.data.total;
} catch (e) {
smartSentry.captureError(e);
} finally {
tableLoading.value = false;
}
}
onMounted(queryData);
// ---------------------------- 添加/修改 ----------------------------
const formRef = ref();
function showForm(data:object) {
formRef.value.show(data);
}
// ---------------------------- 单个删除 ----------------------------
//确认删除
function onDelete(data:object) {
Modal.confirm({
title: '提示',
content: '确定要删除选吗?',
okText: '删除',
okType: 'danger',
onOk() {
requestDelete(data);
},
cancelText: '取消',
onCancel() {
},
});
}
//请求删除
async function requestDelete(data: any) {
SmartLoading.show();
try {
await asnDetailApi.delete(data.asnDetailId);
message.success('删除成功');
await queryData();
} catch (e) {
smartSentry.captureError(e);
} finally {
SmartLoading.hide();
}
}
// ---------------------------- 批量删除 ----------------------------
// 选择表格行
const selectedRowKeyList = ref([]);
function onSelectChange(selectedRowKeys:any) {
selectedRowKeyList.value = selectedRowKeys;
}
// 批量删除
function confirmBatchDelete() {
Modal.confirm({
title: '提示',
content: '确定要批量删除这些数据吗?',
okText: '删除',
okType: 'danger',
onOk() {
requestBatchDelete();
},
cancelText: '取消',
onCancel() {
},
});
}
//请求批量删除
async function requestBatchDelete() {
try {
SmartLoading.show();
await asnDetailApi.batchDelete(selectedRowKeyList.value);
message.success('删除成功');
await queryData();
} catch (e) {
smartSentry.captureError(e);
} finally {
SmartLoading.hide();
}
}
</script>

92
nc_wms_web/src/views/business/wms/receive/asnTask/asn-task-list.vue
View File

@ -13,12 +13,13 @@
<div>
关键字：
<a-input style="width: 250px" v-model:value="queryForm.keyword" placeholder="姓名/手机号/登录账号"/>
<a-button class="button-style" type="primary" @click="onSearch">搜索</a-button>
<a-button class="button-style" type="default" @click="resetQuery">重置</a-button>
<a-button class="button-style" type="primary" @click="onSearch" v-privilege="'task:query'">搜索</a-button>
<a-button class="button-style" type="default" @click="resetQuery" v-privilege="'task:query'">重置</a-button>
</div>
<div class="smart-table-setting-block">
<a-button class="button-style" type="primary" v-privilege="'receive:batchReturn'" @click="confirmBatchReturn"
<a-button class="button-style" type="primary" danger v-privilege="'receive:batchReturn'"
@click="confirmBatchReturn"
:disabled="props.asnId==0 || selectedRowKeyList.length == 0">
<template #icon>
<EditOutlined/>
@ -35,7 +36,7 @@
:dataSource="tableData"
:columns="columns"
:pagination="false"
rowKey="asnDetailId"
rowKey="taskId"
:row-selection="{ selectedRowKeys: selectedRowKeyList, onChange: onSelectChange }"
size="small"
bordered
@ -43,20 +44,7 @@
<template #bodyCell="{ text, record, index, column }">
<template v-if="column.dataIndex === 'action'">
<div class="smart-table-operate">
<a-button @click="showForm(record)" type="link" :disabled="record.orderQuantity-record.receivedQuantity==0"
v-privilege="'asnDetail:update'">
<template #icon>
<EditOutlined/>
</template>
编辑
</a-button>
<a-button @click="onDelete(record)" danger type="link"
:disabled="record.orderQuantity-record.receivedQuantity==0" v-privilege="'asnDetail:delete'">
<template #icon>
<DeleteOutlined/>
</template>
删除
</a-button>
</div>
</template>
@ -77,8 +65,6 @@
:show-total="(total:number) => `共${total}条`"
/>
</div>
<!--新建/编辑-->
<AsnDetailForm ref="formRef" @reloadList="queryData"/>
</div>
</template>
<script setup lang="ts">
@ -87,10 +73,8 @@ import {PAGE_SIZE, PAGE_SIZE_OPTIONS} from '/@/constants/common-const';
import {smartSentry} from '/@/lib/smart-sentry';
import {TABLE_ID_CONST} from "/@/constants/support/table-id-const";
import TableOperator from "/@/components/support/table-operator/index.vue";
import {asnDetailApi} from "/@/api/business/wms/receive/asnDetail/asn-detail-api";
import {taskApi} from "/@/api/business/wms/task/task-api";
import {receiveApi} from "/@/api/business/wms/receive/receive-api";
import AsnDetailForm from "/@/views/business/wms/receive/asnDetail/asn-detail-form.vue";
import {message, Modal} from "ant-design-vue";
import {SmartLoading} from '/@/components/framework/smart-loading';
@ -130,12 +114,7 @@ const columns = reactive([
title: '收货数量',
dataIndex: 'moveQty',
ellipsis: true,
},
{
title: '操作',
dataIndex: 'action',
width: 140,
},
}
]);
// --------------------------- 查询 ---------------------------
@ -178,6 +157,9 @@ async function queryData() {
let queryResult = await taskApi.queryPage(queryForm);
tableData.value = queryResult.data.list;
total.value = queryResult.data.total;
console.log(props.asnId);
console.log(selectedRowKeyList.value);
} catch (e) {
smartSentry.captureError(e);
} finally {
@ -192,49 +174,6 @@ function onSelectChange(selectedRowKeys: any) {
selectedRowKeyList.value = selectedRowKeys;
}
//新建/编辑
const formRef = ref();
function showForm(data: object) {
formRef.value.show(data, props.asnId);
}
//确认是否删除？
function onDelete(data: object) {
Modal.confirm({
title: '提示',
content: '确定要删除选吗?',
okText: '删除',
okType: 'danger',
onOk() {
requestDelete(data);
},
cancelText: '取消',
onCancel() {
},
});
}
//请求删除
async function requestDelete(data: any) {
SmartLoading.show();
try {
const response = await asnDetailApi.delete(data.asnDetailId);
const {error, success} = JSON.parse(response.msg);
if (error) {
message.error(error);
}
if (success) {
message.success(success);
}
await queryData();
} catch (e) {
smartSentry.captureError(e);
} finally {
SmartLoading.hide();
}
}
//批量退货
function confirmBatchReturn() {
Modal.confirm({
@ -251,11 +190,15 @@ function confirmBatchReturn() {
});
}
//请求批量收货
//请求批量退货
async function requestBatchReturn() {
try {
SmartLoading.show();
const response = await receiveApi.batchReceive(selectedRowKeyList.value);
let param = {
asnId: props.asnId,
taskIds: selectedRowKeyList.value,
};
const response = await receiveApi.batchReturn(param);
const {error, success} = JSON.parse(response.msg);
if (error) {
message.error(error);
@ -280,6 +223,9 @@ watch(
},
{immediate: true}
);
defineExpose({
queryData
});
</script>
<style scoped lang="less">